diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index f7c3c0f90e1..d41673fb742 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -31,7 +31,7 @@ repos:
       #- id: check-added-large-files
       - id: check-case-conflict
       #- id: check-executables-have-shebangs
-      #- id: check-merge-conflict
+      - id: check-merge-conflict
       - id: check-vcs-permalinks
       #- id: check-yaml
       - id: detect-private-key