Edit - git-merge-ours