Fix merge conflict of vimrc