Easy git merge conflict resolution in Vim