fixing git merge conflicts