vimrc updated
vimrc
fixed merge