Vim conflicted