diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index 4e1f3e7..2f8f9cc 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -16,12 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-<<<<<<< HEAD
         python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
-=======
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
->>>>>>> ce1a0d32bbc349f905f9819527a2114e0688fea2
-
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}