git commit fatal exiting because of an unresolved conflict