diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 894b26d5..684ac81b 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -9,6 +9,7 @@ repos:
     -   id: trailing-whitespace
     -   id: check-case-conflict
     -   id: check-merge-conflict
+        args: [--assume-in-merge]
     -   id: check-symlinks
     -   id: fix-byte-order-marker
     -   id: mixed-line-ending