diff --git a/.config/nvim/lua/keymap.lua b/.config/nvim/lua/keymap.lua
index d1a091f..b7317a3 100644
--- a/.config/nvim/lua/keymap.lua
+++ b/.config/nvim/lua/keymap.lua
@@ -37,6 +37,7 @@ vim.keymap.set('n', '<leader>ss', ':%s//gI<Left><Left><Left>', { noremap = true
 -- irc compatibility for interactivity
 vim.keymap.set('n', '<leader>is', ':.w >> in<cr>dd', { noremap = true })
 
+-- the following keymap settings are plugin dependent
 
 -- frabjous/knap
 vim.api.nvim_create_autocmd('FileType', {
@@ -60,7 +61,7 @@ vim.keymap.set('n', '<F3>', ':Navbuddy<CR>', {})
 -- nvim-tree/nvim-tree.lua
 vim.keymap.set('n', '<F2>', ':NvimTreeToggle toggle<CR>', {})
 
--- numToStr/FTerm.nvim
+-- numtostr/fterm.nvim
 vim.keymap.set('n', '<leader>t', ':lua require("FTerm").toggle()<CR>', { noremap = true })
 vim.keymap.set('t', '<leader>t', '<C-\\><C-n>:lua require("FTerm").toggle()<CR>', { noremap = true })
 local lazygit = require("FTerm"):new({
@@ -68,6 +69,13 @@ local lazygit = require("FTerm"):new({
 })
 vim.keymap.set({ 'n', 't' }, '<leader>gt', function() lazygit:toggle() end)
 
+-- sindrets/diffview.nvim
+vim.keymap.set( 'n', '<leader>gdo', ":DiffviewOpen<CR>")
+vim.keymap.set( 'n', '<leader>gdc', ":DiffviewClose<CR>")
+
+-- folke/trouble.nvim
+vim.keymap.set( 'n', '<leader>x', ":TroubleToggle<CR>")
+
 -- hrsh7th/nvim-cmp
 vim.keymap.set('n', 'gD', ':lua vim.lsp.buf.declaration()<CR>', { noremap = true })
 vim.keymap.set('n', 'gd', ':lua vim.lsp.buf.definition()<CR>', { noremap = true })
diff --git a/.config/nvim/lua/loadplugins.lua b/.config/nvim/lua/loadplugins.lua
index 0a6f6d1..6a80788 100644
--- a/.config/nvim/lua/loadplugins.lua
+++ b/.config/nvim/lua/loadplugins.lua
@@ -516,6 +516,19 @@ return require("lazy").setup({
     {
       'numToStr/FTerm.nvim',
       opts = {}
+    },
+
+    -- side by side git diffs for merge conflicts
+    {
+      'sindrets/diffview.nvim',
+      opts = {}
+    },
+
+    -- list of errors
+    {
+      "folke/trouble.nvim",
+      dependencies = { "nvim-tree/nvim-web-devicons" },
+      opts = {}
     }
 
   },