fix: remove merge conflicts

.github/workflows/test.yml

@@ -20,6 +20,6 @@ jobs:
         run: python -m pip install --upgrade pip setuptools
       - name: Install dependencies
         run: |
-          pip install 'tutor[dev]>=17.0.0,<18.0.0'
+          pip install .[dev]
       - name: Test lint, types, and format
         run: make test