diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3671f12ae..3a6b0ad69 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,13 +33,9 @@ Docs: https://docs.clawd.bot
 - Agents: surface concrete API error details instead of generic AI service errors.
 - Exec approvals: allow per-segment allowlists for chained shell commands on gateway + node hosts. (#1458) Thanks @czekaj.
 - Agents: make OpenAI sessions image-sanitize-only; gate tool-id/repair sanitization by provider.
-<<<<<<< Updated upstream
 - Agents: make tool summaries more readable and only show optional params when set.
-- Mattermost (plugin): enforce pairing/allowlist gating, keep @username targets, and clarify plugin-only docs. (#1428) Thanks @damoahdominic.
-||||||| Stash base
-=======
 - Agents: centralize transcript sanitization in the runner; keep <final> tags and error turns intact.
->>>>>>> Stashed changes
+- Mattermost (plugin): enforce pairing/allowlist gating, keep @username targets, and clarify plugin-only docs. (#1428) Thanks @damoahdominic.
 - Docs: fix gog auth services example to include docs scope. (#1454) Thanks @zerone0x.
 - macOS: prefer linked channels in gateway summary to avoid false “not linked” status.
 - Providers: improve GitHub Copilot integration (enterprise support, base URL, and auth flow alignment).
diff --git a/docs/docs.json b/docs/docs.json
index 670371a0d..b9dbd9073 100644
--- a/docs/docs.json
+++ b/docs/docs.json
@@ -141,14 +141,6 @@
       "source": "/message/",
       "destination": "/cli/message"
     },
-    {
-      "source": "/mattermost",
-      "destination": "/channels/mattermost"
-    },
-    {
-      "source": "/mattermost/",
-      "destination": "/channels/mattermost"
-    },
     {
       "source": "/providers/discord",
       "destination": "/channels/discord"