modified .vimrc
resolved conflict in .vimrc