return { -- color and improve git merge conflicts "spacedentist/resolve.nvim", lazy = false, opts = {}, }