diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index 9d085e5aa..602ecbca2 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -13,17 +13,10 @@ jobs:
   pre-commit:
     runs-on: ubuntu-22.04
     steps:
-<<<<<<< before updating
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v4
-        with:
-          python-version: "3.10"
-=======
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v2
         with:
           python-version: "3.11"
->>>>>>> after updating
       - name: Get python version
         run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
       - uses: actions/cache@v1