modify .vimrc, nighted.vim
resolved conflict in .vimrc