modify vimrcc
fix conflict