diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6e0ef05..ecb2ae4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -17,7 +17,11 @@ jobs:
 
   tests:
     runs-on: ${{ matrix.os }}
+<<<<<<< Updated upstream
     timeout-minutes: 15 # Consider increasing timeout
+=======
+    timeout-minutes: 15
+>>>>>>> Stashed changes
 
     strategy:
       fail-fast: false
@@ -72,7 +76,11 @@ jobs:
         python-version: 3.12
 
     - name: Check-out repository
+<<<<<<< Updated upstream
       uses: actions/checkout@v2
+=======
+      uses: actions/checkout@v3
+>>>>>>> Stashed changes
       with:
         fetch-depth: 0
 
@@ -81,10 +89,17 @@ jobs:
     # if: needs.cd.outputs.released == 'true'
     runs-on: ubuntu-latest
     steps:
+<<<<<<< Updated upstream
       # - name: Checkout the code with tag ${{ needs.cd.outputs.tag }}
       #   uses: actions/checkout@v3
       #   with:
       #     ref: ${{ needs.cd.outputs.tag }}
+=======
+      - name: Checkout the code with tag # ${{ needs.cd.outputs.tag }}
+        uses: actions/checkout@v3
+        # with:
+        #   ref: ${{ needs.cd.outputs.tag }}
+>>>>>>> Stashed changes
 
       - name: Set up Python 3.12
         uses: actions/setup-python@v4