fixing git merge