update vimrc
fixed merge issue in vimrc