diff --git a/lua/config/diffview.lua b/lua/config/diffview.lua
index c1a0435..e7c0c96 100644
--- a/lua/config/diffview.lua
+++ b/lua/config/diffview.lua
@@ -2,6 +2,9 @@ return {
 	"sindrets/diffview.nvim",
 	requires = 'nvim-lua/plenary.nvim',
 	config = function()
+		require("diffview").setup{
+			enhanced_diff_hl = true
+		}
 		require("legendary").command{
 			":DiffviewOpen", description = "Open diff view"
 		}
diff --git a/lua/config/fugitive.lua b/lua/config/fugitive.lua
deleted file mode 100644
index 54e3136..0000000
--- a/lua/config/fugitive.lua
+++ /dev/null
@@ -1,9 +0,0 @@
-return {
-	'tpope/vim-fugitive',
-	config = function ()
-		-- TODO: Add most commonly used fugitive bindings
-		require("legendary").keymaps{
-			{"<leader>gg", ":G<cr>", description = "Open fugitive", opts = {silent = true}}
-		}
-	end
-}
diff --git a/lua/config/git-conflict.lua b/lua/config/git-conflict.lua
new file mode 100644
index 0000000..50c17fc
--- /dev/null
+++ b/lua/config/git-conflict.lua
@@ -0,0 +1,26 @@
+return {
+	'akinsho/git-conflict.nvim',
+	tag = "*",
+	config = function()
+		require('git-conflict').setup{
+			default_mappings = false
+		}
+
+
+		require("legendary").keymaps{
+			{
+				itemgroup = "git-conflict",
+				description = "Git conflict",
+				icon = "",
+				keymaps = {
+					{ 'co', '<Plug>(git-conflict-ours)', description = "choose ours" },
+					{ 'ct', '<Plug>(git-conflict-theirs)', description = "choose theirs" },
+					{ 'cb', '<Plug>(git-conflict-both)', description = "choose both" },
+					{ 'c0', '<Plug>(git-conflict-none)', description = "choose none" },
+					{ ']x', '<Plug>(git-conflict-prev-conflict)', description = "move to previous conflict" },
+					{ '[x', '<Plug>(git-conflict-next-conflict)', description = "move to next conflict" },
+				}
+			}
+		}
+	end
+}
diff --git a/lua/config/lazygit.lua b/lua/config/lazygit.lua
new file mode 100644
index 0000000..3ed8ede
--- /dev/null
+++ b/lua/config/lazygit.lua
@@ -0,0 +1,8 @@
+return {
+	'kdheepak/lazygit.nvim',
+	config = function ()
+		require("legendary").keymaps{
+			{"<leader>gg", ":LazyGit<cr>", description = "Open lazygit", opts = {silent = true}}
+		}
+	end
+}
diff --git a/lua/plugins.lua b/lua/plugins.lua
index 1750be0..208926d 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -18,7 +18,7 @@ return function(use)
 	use_config "lsputils"
 	use_config "luasnip"
 	use_config "trouble"
-	use_config "fugitive"
+	use_config "lazygit"
 	use_config "gitsigns"
 	use_config "nvim-tree"
 	use_config "autosource"
@@ -31,6 +31,7 @@ return function(use)
 	use_config "treesitter"
 	use_config "ts-playground"
 	use_config "diffview"
+	use_config "git-conflict"
 
 	use {
 		"nvim-telescope/telescope.nvim",