diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
index c8f8c681b2..a5e7ee57cd 100644
--- a/.github/workflows/develop.yml
+++ b/.github/workflows/develop.yml
@@ -638,11 +638,19 @@ jobs:
       - name: Run cargo clippy
         run: make clippy
 
+  conflict-check:
+    name: Check for conflict
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Merge Conflict Finder
+        uses: olivernybroe/action-conflict-finder@v4.0
+
   coverage:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-20.04-8-cores
     timeout-minutes: 60
-    needs:  [clippy, fmt]
+    needs:  [conflict-check, clippy, fmt]
     steps:
       - uses: actions/checkout@v4
       - uses: arduino/setup-protoc@v3
@@ -655,6 +663,7 @@ jobs:
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           components: llvm-tools-preview
+          cache: false
       # - name: Rust Cache
       #   uses: Swatinem/rust-cache@v2
       #   with: