diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index c7faabcc60..4435b881dc 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -64,6 +64,7 @@ repos:
             args: [--fix=lf]
           - id: check-ast
           - id: check-case-conflict
+          - id: check-merge-conflict
           - id: requirements-txt-fixer
     - repo: https://github.com/jumanjihouse/pre-commit-hook-yamlfmt
       rev: 0.2.3