Add vim-conflicts alias to zshrc