Resolves tiny conflict in vimrc