diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 592dac48b..03a6c2d3f 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -10,6 +10,16 @@ on:
     - master
 
 jobs:
+  # https://github.com/Marr11317/ConflictAdviser
+  notify-merge-conflicts:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: Marr11317/ConflictAdviser@v1
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          conflict_label: "merge conflict"
+          comment: 'Rebase needed'
+
   test:
     runs-on: ubuntu-latest
     container: ubuntu:20.04