diff --git a/.github/workflows/smoke-test.yml b/.github/workflows/smoke-test.yml
index 294cf0f..0ab6d2b 100644
--- a/.github/workflows/smoke-test.yml
+++ b/.github/workflows/smoke-test.yml
@@ -19,12 +19,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-<<<<<<< before updating
         python-version: ['3.10']
         notebook-dir: ['core', 'creation', 'estimation', 'evaluation', 'goldenspike']
-=======
-        python-version: ['3.9', '3.10', '3.11']
->>>>>>> after updating
 
     steps:
     - uses: actions/checkout@v3