fixed bad merge in vimrc