automerge conflict resolved