diff --git a/lua/config/git-conflict.lua b/lua/config/git-conflict.lua
new file mode 100644
index 0000000..ffcc385
--- /dev/null
+++ b/lua/config/git-conflict.lua
@@ -0,0 +1,12 @@
+require("git-conflict").setup {}
+
+vim.api.nvim_create_autocmd("User", {
+  pattern = "GitConflictResolved",
+  callback = function()
+    -- clear qf list
+    vim.fn.setqflist({}, "r")
+
+    -- reopen it?
+    vim.cmd([[GitConflictListQf]])
+  end,
+})
diff --git a/lua/plugin_specs.lua b/lua/plugin_specs.lua
index d9e0c91..28c786c 100644
--- a/lua/plugin_specs.lua
+++ b/lua/plugin_specs.lua
@@ -321,7 +321,14 @@ local plugin_specs = {
 
   -- Better git log display
   { "rbong/vim-flog", cmd = { "Flog" } },
-  { "akinsho/git-conflict.nvim", version = "*", config = true },
+  {
+    "akinsho/git-conflict.nvim",
+    version = "*",
+    event = "VeryLazy",
+    config = function()
+      require("config.git-conflict")
+    end,
+  },
   {
     "ruifm/gitlinker.nvim",
     event = "User InGitRepo",