fix merge in .vimrc