diff --git a/git/.gitconfig b/git/.gitconfig
index 51af14e..90168e9 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -19,4 +19,11 @@
 	commit = yellow bold
 	old = red bold
 	new = green bold
-	whitespace = red reverse
+[merge]
+	tool = "nvim"
+[mergetool]
+	keepBackup = false
+	prompt = false
+[mergetool "nvim"]
+	cmd = "nvim -d -c \"wincmd l\" -c \"norm ]c\" \"$LOCAL\" \"$MERGED\" \"$REMOTE\""
+
diff --git a/nvim/.config/nvim/lua/plugins/matchup.lua b/nvim/.config/nvim/lua/plugins/matchup.lua
index d6d2dfb..6faa9fa 100644
--- a/nvim/.config/nvim/lua/plugins/matchup.lua
+++ b/nvim/.config/nvim/lua/plugins/matchup.lua
@@ -2,5 +2,8 @@ return {
 	"andymass/vim-matchup",
 	config = function()
 		vim.g.matchup_matchparen_offscreen = { method = "popup" }
+		vim.g.matchup_matchparen_deferred = 1
+		vim.g.matchup_matchparen_deferred_show_delay = 500
+		vim.g.matchup_matchparen_deferred_hide_delay = 0
 	end,
 }
diff --git a/nvim/.config/nvim/lua/plugins/modes.lua b/nvim/.config/nvim/lua/plugins/modes.lua
deleted file mode 100644
index 21436f3..0000000
--- a/nvim/.config/nvim/lua/plugins/modes.lua
+++ /dev/null
@@ -1,11 +0,0 @@
-return {
-	-- "mvllow/modes.nvim",
-	-- tag = "v0.2.0",
-	-- config = function()
-	-- 	require("modes").setup({
-	-- 		opacity = {
-	-- 			--		visual = 0,
-	-- 		},
-	-- 	})
-	-- end,
-}
diff --git a/nvim/.config/nvim/lua/plugins/neoscroll.lua b/nvim/.config/nvim/lua/plugins/neoscroll.lua
deleted file mode 100644
index edb1da8..0000000
--- a/nvim/.config/nvim/lua/plugins/neoscroll.lua
+++ /dev/null
@@ -1,17 +0,0 @@
-return {
-	"karb94/neoscroll.nvim",
-	config = function()
-		require("neoscroll").setup({
-			-- All these keys will be mapped to their corresponding default scrolling animation
-			mappings = { "<C-u>", "<C-d>", "<C-b>", "<C-f>", "<C-y>", "<C-e>", "zt", "zz", "zb" },
-			hide_cursor = true, -- Hide cursor while scrolling
-			stop_eof = true, -- Stop at <EOF> when scrolling downwards
-			respect_scrolloff = false, -- Stop scrolling when the cursor reaches the scrolloff margin of the file
-			cursor_scrolls_alone = true, -- The cursor will keep on scrolling even if the window cannot scroll further
-			easing_function = nil, -- Default easing function
-			pre_hook = nil, -- Function to run before the scrolling animation starts
-			post_hook = nil, -- Function to run after the scrolling animation ends
-			performance_mode = false, -- Disable "Performance Mode" on all buffers.
-		})
-	end,
-}
diff --git a/nvim/.config/nvim/lua/plugins/oil.lua b/nvim/.config/nvim/lua/plugins/oil.lua
index 081391e..011cd40 100644
--- a/nvim/.config/nvim/lua/plugins/oil.lua
+++ b/nvim/.config/nvim/lua/plugins/oil.lua
@@ -178,7 +178,7 @@ return {
 				border = "rounded",
 			},
 		})
-		vim.keymap.set("n", "-", "<CMD>Oil --float<CR>", { desc = "Open parent directory" })
+		vim.keymap.set("n", "-", "<CMD>Oil<CR>", { desc = "Open parent directory" })
 	end,
 	opts = {},
 	-- Optional dependencies
diff --git a/zsh/.zsh/cache/.zsh-update b/zsh/.zsh/cache/.zsh-update
index 13b92cf..23c825e 100644
--- a/zsh/.zsh/cache/.zsh-update
+++ b/zsh/.zsh/cache/.zsh-update
@@ -1 +1 @@
-LAST_EPOCH=19898
+LAST_EPOCH=19922