diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index c5d05ee9..d04178b6 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -5,4 +5,6 @@ repos:
     -   id: trailing-whitespace
     -   id: end-of-file-fixer
     -   id: check-yaml
+    -   id: check-merge-conflict
     -   id: check-added-large-files
+        args: ['--maxkb=2000']