no git merge conflict