exiting because of an unresolved conflict git