resolving git merge conflict