diff --git a/.github/mergify.yml b/.github/mergify.yml
index a39fae4d878..d8bb1105e59 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -1,6 +1,9 @@
 queue_rules:
   - name: default
-    conditions:
+    commit_message_template: |
+      {{ title }} (#{{ number }})
+      {{ body }}
+    merge_conditions:
       - "#approved-reviews-by>=1"
       - base=main
       - label=automerge
@@ -14,10 +17,7 @@ pull_request_rules:
     actions:
       queue:
         name: default
-        method: squash
-        commit_message_template: |
-          {{ title }} (#{{ number }})
-          {{ body }}
+        merge_method: squash
   - name: backport patches to v0.1.x callbacks ibc-go v7.3.x branch
     conditions:
       - base=main
diff --git a/.github/workflows/proto-breaking-check.yml b/.github/workflows/proto-breaking-check.yml
new file mode 100644
index 00000000000..8e675beb0f3
--- /dev/null
+++ b/.github/workflows/proto-breaking-check.yml
@@ -0,0 +1,16 @@
+name: proto breaking check
+# proto breaking check workflow checks if Protobuf file contains breaking changes.
+# This workflow runs when a PR that targets Protobuf is opened.
+on:
+  merge_group:
+  pull_request:
+    paths:
+      - "proto/**/*.proto"
+
+jobs:
+  proto-breaking-check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Run proto-breaking check
+        run: make proto-check-breaking
\ No newline at end of file
diff --git a/.golangci.yml b/.golangci.yml
index 32cd4cb67af..dc20f7102ee 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -5,7 +5,7 @@ run:
 linters:
   disable-all: true
   enable:
-    - exportloopref
+    - copyloopvar
     - errcheck
     - gci
     - goconst