diff --git a/.github/actions/check_style/action.yml b/.github/actions/check_style/action.yml
index d4e5d62f2c65fb1a8bfd102244a6c0a866ed45d1..0191adc7fec421fd3a6dcd44033f4b4cfdc38097 100644
--- a/.github/actions/check_style/action.yml
+++ b/.github/actions/check_style/action.yml
@@ -23,8 +23,3 @@ runs:
         export SQUAWK_GITHUB_TOKEN=${{ github.token }}
         . ./script/squawk
 
-    - uses: bufbuild/buf-setup-action@v1
-    - uses: bufbuild/buf-breaking-action@v1
-      with:
-        input: "crates/rpc/proto/"
-        against: "https://github.com/${GITHUB_REPOSITORY}.git#branch=main,subdir=crates/rpc/proto/"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bbaa12ecdd4fcbf2e0858dc6d75342e34d8225c2..6b08f0d765e1221390c9966882d11370b7d601ed 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -48,6 +48,18 @@ jobs:
       - name: Run style checks
         uses: ./.github/actions/check_style
 
+      - name: Ensure fresh merge
+        run: |
+          git checkout -B temp
+          git merge -q origin/main -m "merge main into temp"
+
+      - uses: bufbuild/buf-setup-action@v1
+      - uses: bufbuild/buf-breaking-action@v1
+        with:
+            input: "crates/rpc/proto/"
+            against: "https://github.com/${GITHUB_REPOSITORY}.git#branch=main,subdir=crates/rpc/proto/"
+
+
   tests:
     name: Run tests
     runs-on: