diff --git a/.vscode/settings.json b/.vscode/settings.json
index 3d4c6b42..b294c736 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -9,12 +9,14 @@
             "path": "/bin/bash"
         }
     },
-<<<<<<< HEAD
-=======
     "python.testing.unittestEnabled": false,
     "python.testing.pytestEnabled": true,
-    "python.testing.pytestArgs": ["-s", "-q", "--no-cov"]
->>>>>>> 11b482838efcf46f376fd3ecbf2c1bb0be6d097d
+    "python.testing.pytestArgs": ["-s", "-q", "--no-cov"],
+
+    "python.languageServer": "Pylance",
+    "python.analysis.typeCheckingMode": "strict",
+    "python.analysis.autoSearchPaths": true,
+    "python.analysis.extraPaths": ["./src"]
 
     // Hot reload setting that needs to be in user settings
     // "jupyter.runStartupCommands": [