diff --git a/.vscode/cspell.json b/.vscode/cspell.json
new file mode 100644
index 00000000000..48c7f15ee2b
--- /dev/null
+++ b/.vscode/cspell.json
@@ -0,0 +1,17 @@
+{
+    "version": "0.2",
+    "language": "en",
+    "words": [
+        "ICESTORM",
+        "unmarshal",
+        "unmarshaling"
+    ],
+    "dictionaries": [
+        "csharp",
+        "softwareTerms",
+        "en_US"
+    ],
+    "enableFiletypes": [
+        "ice"
+    ]
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 20e2ef759f5..bc0a2e68337 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -82,10 +82,13 @@
         "__memory": "cpp"
     },
     "C_Cpp.default.cppStandard": "c++20",
+<<<<<<< Updated upstream
     "cSpell.words": [
         "decoratee",
         "ICESTORM",
         "unmarshal",
         "unmarshaling"
     ],
+=======
+>>>>>>> Stashed changes
 }