vimrc: fix merge errors