diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml
index fca0010..6d26701 100644
--- a/.github/workflows/python-app.yml
+++ b/.github/workflows/python-app.yml
@@ -29,10 +29,6 @@ jobs:
         isort --check --diff tastytrade/ tests/
         flake8 --count --show-source --statistics tastytrade/ tests/
         mypy -p tastytrade
-<<<<<<< HEAD
-=======
-        mypy -p tests
->>>>>>> eb81296 (add pytest)
     - name: Testing...
       run: |
         python -m pytest --cov=tastytrade --cov-report=term-missing tests/