[FIX] all: fix pre-commit new checks

.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

.github/workflows/stale.yml.rej

@@ -1,9 +0,0 @@
-diff a/.github/workflows/stale.yml b/.github/workflows/stale.yml	(rejected hunks)
-@@ -15,2 +15,3 @@ jobs:
-           # General settings.
-+          ascending: true
-           remove-stale-when-updated: true
-@@ -52,2 +53,3 @@ jobs:
-           repo-token: ${{ secrets.GITHUB_TOKEN }}
-+          ascending: true
-           only-labels: "needs more information"