fix .vimrc.moving
fix conflict merge