diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
index a9e7221..657b328 100644
--- a/.github/workflows/python-publish.yml
+++ b/.github/workflows/python-publish.yml
@@ -42,4 +42,8 @@ jobs:
       uses: pypa/gh-action-pypi-publish@27b31702a0e7fc50959f5ad993c78deac1bdfc29
       with:
         user: __token__
-        password: ${{ secrets.PYPI_API_TOKEN }}
\ No newline at end of file
+<<<<<<< HEAD
+        password: ${{ secrets.PYPI_API_TOKEN }}
+=======
+        password: ${{ secrets.PYPI_API_TOKEN }}
+>>>>>>> b2c57d7400cb9776f7d8075e21ce07265a1badfd