update path
update vimrc
fix conflict