diff --git a/.github/workflows/check-pr-conflict.yml b/.github/workflows/check-pr-conflict.yml
deleted file mode 100644
index 0ca58f4..0000000
--- a/.github/workflows/check-pr-conflict.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: "Check PRs conflict"
-on:
-  workflow_call:
-
-jobs:
-  prs-conflict-Check:
-    name: 'Check PRs status: conflicts and resolution'
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      pull-requests: write
-    steps:
-      - name: Bullfrog Secure Runner
-        continue-on-error: true
-        uses: bullfrogsec/bullfrog@v0.8.4
-        with:
-          egress-policy: audit
-
-      - name: check if PRs are dirty
-        uses: eps1lon/actions-label-merge-conflict@v3
-        with:
-          dirtyLabel: "conflicts"
-          removeOnDirtyLabel: "state: conflict resolved"
-          repoToken: "${{ secrets.GITHUB_TOKEN }}"
-          retryAfter: 120
-          retryMax: 10
-          commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
-          commentOnClean: "Conflicts have been resolved. A maintainer will review the pull request shortly."
diff --git a/AGENTS.md b/AGENTS.md
index 923c54d..a468946 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -26,7 +26,7 @@ python scripts/transclude-template <file.xml>
 
 ## Repository layout
 
-- `.github/workflows/` — reusable workflows: staleness (`check-stale`), PR validation (`check-pr-conflict`, `check-pr-merge-conflict`), linting (`lint-doc`, `lint-j2`, `lint-with-ruff`, `lint-with-darker-ruff`, `check-unused-imports`, `check-typos`), security (`codeql-analysis`), CLA (`cla-check`), package rebuilds (`trigger-rebuild-repo-package`, `trigger-and-wait-rebuild-repo-package`), mirror (`pr-mirror-repo-sync`). PR labeling, author-assign, and title/commit-format checks moved to central Mergify rules in `vyos/mergify` (T8937 retirement).
+- `.github/workflows/` — reusable workflows: staleness (`check-stale`), PR validation (`check-pr-merge-conflict`), linting (`lint-doc`, `lint-j2`, `lint-with-ruff`, `lint-with-darker-ruff`, `check-unused-imports`, `check-typos`), security (`codeql-analysis`), CLA (`cla-check`), package rebuilds (`trigger-rebuild-repo-package`, `trigger-and-wait-rebuild-repo-package`), mirror (`pr-mirror-repo-sync`). PR labeling, author-assign, title/commit-format, and base-branch conflict labeling moved to central Mergify rules in `vyos/mergify` (T8937 retirement). `check-pr-merge-conflict` is preserved — it covers the committed-conflict-marker case (T8934) that Mergify's `conflict` predicate cannot.
 - `.github/doc-linter.py` — RST/TXT linter (RFC 5737/3849 IPs, ≤80-char lines, `.. stop_vyoslinter` toggles).
 - `.github/.typos.toml` — default `typos` config; excludes `smoketest/**`, `mibs/**`.
 - `scripts/` — helpers (Python + shell).