update .vimrc
Fix conflict