diff --git a/.github/workflows/conflicts.yaml b/.github/workflows/conflicts.yaml
new file mode 100644
index 000000000000..16964503f671
--- /dev/null
+++ b/.github/workflows/conflicts.yaml
@@ -0,0 +1,29 @@
+name: Check for merge conflicts
+
+on:
+  push:
+    branches:
+      - main
+      - release-*
+  pull_request_target:
+    types:
+      - opened
+      - reopened
+      - synchronize
+    branches:
+      - main
+      - release-*
+
+permissions:
+  contents: read
+  pull-requests: write
+
+jobs:
+  main:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check for merge conflicts
+        uses: eps1lon/actions-label-merge-conflict@v2.1.0
+        with:
+          repoToken: ${{ secrets.GITHUB_TOKEN }}
+          dirtyLabel: merge-conflict