fix conflict in mark.vim