nothing changed.commited because of conflict using "theirs" file