diff --git a/lazy-lock.json b/lazy-lock.json
index f1913a8..78c1254 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -4,6 +4,7 @@
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp-snippy": { "branch": "master", "commit": "6e39210aa3a74e2bf6462f492eaf0d436cd2b7d3" },
   "codeium.nvim": { "branch": "main", "commit": "f6a2ef32a9e923cb0104a19d3e426b0e40e49505" },
+  "git-conflict.nvim": { "branch": "main", "commit": "bfd9fe6fba9a161fc199771d85996236a0d0faad" },
   "gitsigns.nvim": { "branch": "main", "commit": "562dc47189ad3c8696dbf460d38603a74d544849" },
   "import-cost.nvim": { "branch": "main", "commit": "332b9870c7b22dcfb297a0be7d7a87c148181694" },
   "indent-blankline.nvim": { "branch": "master", "commit": "db926997af951da38e5004ec7b9fbdc480b48f5d" },
diff --git a/lua/plugins/git-conflict.lua b/lua/plugins/git-conflict.lua
new file mode 100644
index 0000000..50f9445
--- /dev/null
+++ b/lua/plugins/git-conflict.lua
@@ -0,0 +1,6 @@
+return {
+	"https://github.com/akinsho/git-conflict.nvim",
+	version = "v2.0.0",
+	event = { "BufReadPre", "BufNewFile" },
+	config = true,
+}