diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index e0accb83..00000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-<<<<<<< HEAD
-  "python.testing.unittestEnabled": false,
-  "python.testing.pytestEnabled": true
-=======
-    "python.testing.unittestEnabled": false,
-    "python.testing.pytestEnabled": true,
-    "python.testing.unittestArgs": [
-        "-v",
-        "-s",
-        "./tests",
-        "-p",
-        "test_*.py"
-    ]
->>>>>>> squashed into one geotype commit
-}
\ No newline at end of file