update gvimrc configuration
handle conflict durin merge