feat: git conflic plugin

lua/plugins/git.lua

@@ -11,6 +11,22 @@ return {
 
 	{ "tpope/vim-fugitive" },
 
+	{
+		'akinsho/git-conflict.nvim',
+		version = "*",
+		opts = {
+			default_mappings = true, -- disable buffer local mapping created by this plugin
+			default_commands = true, -- disable commands created by this plugin
+			disable_diagnostics = false, -- This will disable the diagnostics in a buffer whilst it is conflicted
+			list_opener = 'copen',
+			highlights = {
+				incoming = 'DiffAdd',
+				current = 'DiffText',
+			}
+		},
+		config = true
+	}
+
 	-- {
 	-- 	-- dir = "~/Documents/Code/monkey-alert.nvim",
 	-- 	"dqnid/monkey-alert.nvim",