update vimrc
merge