update vimrc
Merge