updated gvimrc
.
fixed conflict