diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index 6beda282..bd198e07 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -21,6 +21,7 @@
   "dressing.nvim": { "branch": "master", "commit": "fc78a3ca96f4db9f8893bb7e2fd9823e0780451b" },
   "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" },
   "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
+  "git-conflict.nvim": { "branch": "main", "commit": "4bbfdd92d547d2862a75b4e80afaf30e73f7bbb4" },
   "grug-far.nvim": { "branch": "main", "commit": "4b19888719e45ed696d140af2e4e4e3840a5387a" },
   "image.nvim": { "branch": "master", "commit": "5f8fceca2d1be96a45b81de21c2f98bf6084fb34" },
   "inc-rename.nvim": { "branch": "main", "commit": "1871ca49ae6ee3e9ebee37955ba10c7b1425974f" },
diff --git a/.config/nvim/lua/config/keymaps.lua b/.config/nvim/lua/config/keymaps.lua
index b9ee2b3d..6592919d 100644
--- a/.config/nvim/lua/config/keymaps.lua
+++ b/.config/nvim/lua/config/keymaps.lua
@@ -48,12 +48,15 @@ map({ "n" }, "<S-h>", "L", { remap = false })
 map({ "n" }, "<S-l>", "H", { remap = false })
 -- better delete and put
 
+-- Duplicate and comment line
+map({ "n" }, "<leader>yc", '"zyygcc"zp', { remap = true, silent = true, desc = "Duplicate and comment line" })
+
 -- better quit
 map("n", "<C-q>", "<cmd>qa<cr>", { desc = "Quit All" })
 
--- map("n", "<C-x>", function()
---   Snacks.bufdelete()
--- end, { remap = true, desc = "Delete Buffer" })
+map("n", "<C-X>", function()
+  Snacks.bufdelete()
+end, { remap = true, desc = "Delete Buffer" })
 
 -- yank history
 map({ "n", "x" }, "<leader>fp", function()
@@ -64,7 +67,7 @@ map({ "n", "x" }, "<leader>fp", function()
   end
 end, { desc = "Open Yank History", remap = false })
 -- TODO: add leader + y for save current buf, leader + Y to write all
-map({ "n", "x" }, "<leader>y", ":w<CR>", { desc = "Save" })
+-- map({ "n", "x" }, "<leader>y", ":w<CR>", { desc = "Save" })
 map({ "n", "x" }, "<leader>Y", ":wa<CR>", { desc = "Save All" })
 
 -- Zen Mode
diff --git a/.config/nvim/lua/plugins/diffview.lua b/.config/nvim/lua/plugins/diffview.lua
index e69de29b..a7485822 100644
--- a/.config/nvim/lua/plugins/diffview.lua
+++ b/.config/nvim/lua/plugins/diffview.lua
@@ -0,0 +1,5 @@
+return {
+  "akinsho/git-conflict.nvim",
+  version = "*",
+  config = true,
+}
diff --git a/.config/nvim/lua/plugins/neogit.lua b/.config/nvim/lua/plugins/neogit.lua
index 5d47f5f1..0ee08a86 100644
--- a/.config/nvim/lua/plugins/neogit.lua
+++ b/.config/nvim/lua/plugins/neogit.lua
@@ -1,6 +1,6 @@
 return {
   "NeogitOrg/neogit",
-  enabled = "false",
+  enabled = true,
   dependencies = {
     "nvim-lua/plenary.nvim", -- required
     "sindrets/diffview.nvim", -- optional - Diff integration