diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 6f804c41..edfe8836 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -4,6 +4,7 @@ repos:
   hooks:
   - id: end-of-file-fixer
   - id: trailing-whitespace
+  - id: check-merge-conflict
   - id: no-commit-to-branch
     args: ['--branch', 'main']
 - repo: https://github.com/astral-sh/ruff-pre-commit