git pull fatal exiting because of an unresolved conflict