fixed merge conflict for vimrc