modified vimrc
fixed merge conflicts