diff --git a/.github/workflows/format.yaml b/.github/workflows/format.yaml
index 44537cde76..c6f9fb3f71 100644
--- a/.github/workflows/format.yaml
+++ b/.github/workflows/format.yaml
@@ -19,9 +19,15 @@ jobs:
     - uses: actions/setup-python@v5
       with:
         python-version: '3.10'
+<<<<<<< HEAD
     - name: Install clang-format-12
       run: sudo apt-get install clang-format-12
     - uses: pre-commit/action@v3.0.0
+=======
+    - name: Install clang-format-14
+      run: sudo apt-get install clang-format-14
+    - uses: pre-commit/action@v3.0.1
+>>>>>>> 78d6e1fd4 (🛠️ Bump pre-commit/action from 3.0.0 to 3.0.1 (#2677))
       id: precommit
     - name: Upload pre-commit changes
       if: failure() && steps.precommit.outcome == 'failure'