diff --git a/.github/workflows/conflict-notify.yml b/.github/workflows/conflict-notify.yml
new file mode 100644
index 0000000000..6a023745f2
--- /dev/null
+++ b/.github/workflows/conflict-notify.yml
@@ -0,0 +1,22 @@
+name: check PRs for merge conflicts
+
+on:
+    push:
+        branches:
+          - master
+          - 'maint-*'
+          - 'rfc/new-abi*'
+
+permissions:
+    pull-requests: write
+
+jobs:
+    notify:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v2
+            - uses: nokamoto/merge-conflict-action@v0.0.4
+              with:
+                owner: X11Libre
+                repo: xserver
+                token: ${{ secrets.GITHUB_TOKEN }}