updated vimrc
fixed merge conflicts for vimrc