vimrc got borked with all the rebasing and merging