A plugin to visualise and resolve merge conflicts in neovim