Update .gvimrc

Conflict solved