update vimrc
merge update