return { { "NeogitOrg/neogit", dependencies = { "nvim-lua/plenary.nvim", "sindrets/diffview.nvim", }, cmd = "Neogit", opts = { integrations = { diffview = true, }, }, }, { "madmaxieee/unclash.nvim", lazy = false, opts = { action_buttons = { enabled = true, }, annotations = { enabled = true, }, }, keys = { { "]x", function() require("unclash").next_conflict() end, desc = "Next Conflict", }, { "[x", function() require("unclash").prev_conflict() end, desc = "Prev Conflict", }, { "co", function() require("unclash").open_merge_editor() end, desc = "Open Merge Editor", }, { "cc", function() require("unclash").accept_current() end, desc = "Accept Current", }, { "ci", function() require("unclash").accept_incoming() end, desc = "Accept Incoming", }, { "cb", function() require("unclash").accept_both() end, desc = "Accept Both", }, { "fx", function() require("unclash.snacks").pick() end, desc = "Pick Conflicts", }, }, }, }