git merge corrections