fetch merge2
fetch-merge conflict resolution