Merge remote-tracking branch 'origin/main'

src/controllers/api/saveSettingsController.ts

@@ -14,7 +14,7 @@ const saveSettingsController: RequestHandler = async (req, res): Promise<void> =
     const settingResults = getJSONfromString<ISaveSettingsRequest>(String(req.body));
 
     const inventory = await getInventory(accountId);
-    inventory.Settings = settingResults.Settings;
+    inventory.Settings = Object.assign(inventory.Settings, settingResults.Settings);
     await inventory.save();
     res.json(inventory.Settings);
 };