Fixing git merge conflicts