vimrc
Fix conflict