git cherry pick commit merge conflict