diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 1ea48ca34f..3544ac3af2 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -62,11 +62,7 @@ repos:
 
   # CPP hooks
   - repo: https://github.com/pre-commit/mirrors-clang-format
-<<<<<<< HEAD
-    rev: v18.1.0
-=======
     rev: v18.1.2
->>>>>>> 99d7128 (Bump version of pre-commit hooks (#1456))
     hooks:
       - id: clang-format
         args: ['-fallback-style=none', '-i']