git merge exiting because of an unresolved conflict