vimrc renewal
resove conflict