diff --git a/.vscode/settings.json b/.vscode/settings.json
index 4d8d0a871d87451e502c1935a23937fd26d03594..fc1f6696b8c646209b4d9281cedda5e55a297dab 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -122,6 +122,7 @@
         "Aeroutils",
         "AIRBRAKES",
         "Baro",
+        "Betto",
         "Boardcore",
         "CALIB",
         "Canbus",
@@ -132,6 +133,7 @@
         "compid",
         "Conterio",
         "CONTIN",
+        "Corigliano",
         "CPHA",
         "cppcheck",
         "cwise",
@@ -147,15 +149,22 @@
         "EXTI",
         "Gpio",
         "GPIOF",
+        "GPIOG",
         "KALM",
         "kalman",
+        "Leds",
         "Lolli",
         "magcal",
+        "Mandelli",
         "mavlink",
         "miosix",
         "MPXH",
+        "Musso",
+        "Niccolò",
         "Nidasio",
         "pitot",
+        "Qemergency",
+        "Riccardo",
         "RSSI",
         "SATS",
         "setb",
@@ -174,6 +183,11 @@
     "cmake.configureSettings": {
         "CMAKE_C_COMPILER_LAUNCHER": "ccache",
         "CMAKE_CXX_COMPILER_LAUNCHER": "ccache"
+<<<<<<< HEAD
     },
     "compilerexplorer.compilationDirectory": "${workspaceFolder}/build"
-}
\ No newline at end of file
+}
+=======
+    }
+}
+>>>>>>> 170759b0 ([vscode] Add cspell words to workspace dictionary)