fix conflict
update vimrc
change gvim theme