more git merge conflict resolution

in sublime