reconciled vimrc conflicts