Updates to vimrc
Fixed merge conflict