diff --git a/nvim/.config/nvim/lua/keymappings.lua b/nvim/.config/nvim/lua/keymappings.lua
index a70af9b..523d401 100644
--- a/nvim/.config/nvim/lua/keymappings.lua
+++ b/nvim/.config/nvim/lua/keymappings.lua
@@ -129,3 +129,8 @@ remap('n', 'dl', '<cmd>lua vim.diagnostic.setloclist()<CR>'               , opts
 remap('n', 'dq', '<cmd>lua vim.diagnostic.setqflist()<CR>'                , opts)
 remap('n', ',d', '<cmd>lua vim.diagnostic.open_float(0, {scope="line"})<CR>'  , opts)
 remap('n', ',D', '<cmd>lua vim.diagnostic.open_float(0, {scope="cursor"})<CR>', opts)
+
+-- DiffConflicts
+remap('n', '<Leader>dc', ':DiffConflicts<CR>'           , opts)
+remap('n', '<Leader>ds', ':DiffConflictsShowHistory<CR>', opts)
+remap('n', '<Leader>dw', ':DiffConflictsWithHistory<CR>', opts)