diff --git a/doc/diffs.nvim.txt b/doc/diffs.nvim.txt
index ed9a213..95edd60 100644
--- a/doc/diffs.nvim.txt
+++ b/doc/diffs.nvim.txt
@@ -163,6 +163,8 @@ Configuration is done via `vim.g.diffs`. Set options before the plugin loads:
 
         {conflict}           (boolean|table, default: true)
                              Highlight and resolve inline merge conflicts.
+                             Set to false to disable.
+                             See |diffs.nvim-conflict|.
 
                                                        *diffs.nvim.Highlights*
     Highlights table fields: ~
@@ -1046,13 +1048,15 @@ unchanged.
 ==============================================================================
 CONFLICT RESOLUTION                                      *diffs.nvim-conflict*
 
-diffs.nvim detects inline merge conflict markers (`<<<<<<<`/`=======`/
-`>>>>>>>`) in working files and provides highlighting and resolution actions.
-Both standard and diff3 (`|||||||`) formats are supported.
+diffs.nvim highlights merge conflicts in working files.  It recognizes standard
+markers (`<<<<<<<`, `=======`, `>>>>>>>`) and diff3 base sections (`|||||||`).
 
-Conflict regions are detected automatically on `BufReadPost` and re-scanned on
-`TextChanged`. When all conflicts in a buffer are resolved, highlighting is
-removed.
+diffs.nvim detects conflicts when you open a file and updates their highlights
+as you edit.  Resolve conflicts with the mappings below or edit the text directly.
+
+To disable conflict handling: >lua
+    vim.g.diffs = { conflict = false }
+<
 
 Buffer-local mappings: ~                      *diffs.nvim-conflict-keymaps*
 
diff --git a/lua/diffs/config.lua b/lua/diffs/config.lua
index 0ea8e5c..6abdf02 100644
--- a/lua/diffs/config.lua
+++ b/lua/diffs/config.lua
@@ -34,7 +34,6 @@ local integration_metadata = require('diffs.integrations')
 ---@field prev string|false
 
 ---@class diffs.ConflictConfig
----@field enabled? boolean Deprecated.
 ---@field keymaps diffs.ConflictKeymaps|false
 
 ---@class diffs.DifftasticConfig
@@ -158,18 +157,6 @@ function M.new(opts)
       end
     end
   end
-  if type(result.conflict) == 'table' and result.conflict.enabled ~= nil then
-    vim.notify_once(
-      '[diffs]: conflict.enabled is deprecated. Support ends on November 30, 2026. '
-        .. 'Use conflict = false to disable conflict handling. Otherwise remove enabled.',
-      vim.log.levels.WARN
-    )
-    if result.conflict.enabled == false then
-      result.conflict = false
-    else
-      result.conflict.enabled = nil
-    end
-  end
   if result.conflict == true then
     result.conflict = vim.deepcopy(DEFAULTS.conflict)
   end