diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 87bde6b0c..a013ba582 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -21,11 +21,7 @@ jobs:
 
     - uses: actions/setup-python@v4
       with:
-<<<<<<< HEAD
         python-version: ${{ matrix.python-version }}
-=======
-        python-version: 3.8
->>>>>>> origin/master
 
     - run: |
         sudo apt-get update