update vimrc
merge vimrc