diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index a848c634..cb3e5575 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -12,7 +12,7 @@ repos:
           - --exclude=docs/
           - --exclude=scripts/
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.9.5
+    rev: v0.9.6
     hooks:
       - id: ruff
         types_or: [python, pyi, jupyter]
@@ -33,6 +33,8 @@ repos:
     hooks:
       - id: no-commit-to-branch
         args: [--branch, main]
+        skip:
+        - merge
       - id: debug-statements
       - id: trailing-whitespace
       - id: end-of-file-fixer