diff --git a/.github/workflows/conflict-marker-check.yml b/.github/workflows/conflict-marker-check.yml
new file mode 100644
index 000000000..14f308709
--- /dev/null
+++ b/.github/workflows/conflict-marker-check.yml
@@ -0,0 +1,20 @@
+name: conflict-marker-check
+
+on:
+  pull_request:
+
+jobs:
+  conflict-markers:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Check for merge conflict markers
+        run: |
+          markers=$(git grep -l '<<<<<<< HEAD\|=======$' -- \
+            $(git ls-files | grep -vE '\.venv/|node_modules/|dist/|build/|\.cache/|_vendor/' | tr '\n' ' ') 2>/dev/null || true)
+          if [ -n "$markers" ]; then
+            echo "::error::Merge conflict markers found in tracked files:"
+            echo "$markers"
+            exit 1
+          fi
+          echo "No conflict markers found."