diff --git a/lua/custom/plugins/conflictmarker.lua b/lua/custom/plugins/conflictmarker.lua
index d2c68fe..797b02c 100644
--- a/lua/custom/plugins/conflictmarker.lua
+++ b/lua/custom/plugins/conflictmarker.lua
@@ -32,15 +32,10 @@ return {
       end
 
       -- Autocommand to disable diagnostics on buffer enter
-      vim.api.nvim_create_autocmd('BufRead', {
+      vim.api.nvim_create_autocmd({ 'BufRead', 'BufWritePre' }, {
         group = vim.api.nvim_create_augroup('git-conflict-lsp-disable', { clear = true }),
         callback = git_conflict_detection,
       })
-      -- Autocommand to disable diagnostics on save
-      vim.api.nvim_create_autocmd('BufWritePre', {
-        group = vim.api.nvim_create_augroup('git-conflict-lsp-disable', { clear = false }),
-        callback = git_conflict_detection,
-      })
     end,
   },
 }