vimrc: Add vim-conflicted plug-in