diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d5e759ce5..c9716c148 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -17,7 +17,11 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest]
+<<<<<<< HEAD
         python-version: [ '3.9', '3.10', '3.11', '3.12']
+=======
+        python-version: ['3.9', '3.10', '3.11']
+>>>>>>> 78ccf96c ([MAINT] Drop python 3.8 (#663))
     steps:
       - uses: actions/checkout@v4
       - uses: snok/install-poetry@v1
diff --git a/pyproject.toml b/pyproject.toml
index 273fdb370..cc74e792a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -27,8 +27,13 @@ classifiers = [
 ]
 
 [tool.poetry.dependencies]
+<<<<<<< HEAD
 python = ">=3.9,<3.13"
 torch = "^2.3.0"
+=======
+python = ">=3.9,<3.12"
+torch = "^2.1.0"
+>>>>>>> 78ccf96c ([MAINT] Drop python 3.8 (#663))
 torchvision = "*"
 tensorboard = "*"
 toml = "*"