git pull exiting because of an unresolved conflict