Resolve conflicts

.github/workflows/build_documentation.yml

@@ -35,4 +35,4 @@ jobs:
         uses: JamesIves/github-pages-deploy-action@4.1.4
         with:
           branch: documentation
-          folder: ./documentation
+          folder: ./documentation

.github/workflows/publish_to_pypi.yml

@@ -38,4 +38,4 @@ jobs:
       uses: pypa/gh-action-pypi-publish@27b31702a0e7fc50959f5ad993c78deac1bdfc29
       with:
         user: __token__
-        password: ${{ secrets.PYPI_API_TOKEN }}
+        password: ${{ secrets.PYPI_API_TOKEN }}

.github/workflows/pytest.yml

@@ -25,4 +25,4 @@ jobs:
     
     - name: Test with pyTest
       run: |
-        python -m pytest -v
+        python -m pytest -v