updating vimrc
merge