From ea7accee4dd679b5c9bbf04482963e12cf89d482 Mon Sep 17 00:00:00 2001
From: rad1092 <259188368+rad1092@users.noreply.github.com>
Date: Mon, 12 Oct 2026 20:15:01 +0900
Subject: [PATCH] docs(users): add ConflictBench to conflict tools

---
 users/contrib.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/users/contrib.rst b/users/contrib.rst
index a3ade189..24c843ff 100644
--- a/users/contrib.rst
+++ b/users/contrib.rst
@@ -266,6 +266,12 @@ Monitoring
 Resolving conflicts
 ~~~~~~~~~~~~~~~~~~~
 
+- `ConflictBench <https://github.com/rad1092/conflictbench>`_
+
+  A local desktop tool for reviewing Syncthing conflicts, choosing which
+  versions to keep, and saving backups outside synced folders.
+  Pause Syncthing for the affected folder before applying a reviewed plan.
+
 - `syncthing-resolve-conflicts <https://github.com/dschrempf/syncthing-resolve-conflicts>`_
 
   A small bash script that handles synchronization conflicts in text