Rebase onto formatted Jsons (conflict resolve)

Libraries/SPTarkov.Server.Assets/SPT_Data/configs/core.json

@@ -25,7 +25,7 @@
         "question_1": "An update to a popular mod that makes the game more realistic has been released, which of the following actions on discord will you do?",
         "question_1_answer_1": "Ignore the changelog",
         "question_1_answer_2": "Ignore the readme",
-        "question_1_answer_3": "Ask in general chat why the guns dont shoot",
+        "question_1_answer_3": "Ask in general chat why the guns don't shoot",
         "question_1_answer_4": "Argue with general chat when they tell you to read the readme",
         "question_1_answer_5": "Install as many mods as you can at the same time and get mad when everything breaks",
         "question_1_answer_6": "Inform general chat of your displeasure and get mad when they laugh at you",
@@ -39,11 +39,11 @@
         "question_2_answer_2": "Get REAL mad and voice your opinion in every possible chat you can",
         "question_2_answer_3": "Travel around various discords informing anyone who listens what bad people SPT are",
         "question_2_answer_4": "Create dozens of alt accounts to DM staff and inform them of your displeasure",
-        "question_2_answer_5": "Ask when the old SPT verison is coming back every day for weeks",
+        "question_2_answer_5": "Ask when the old SPT version is coming back every day for weeks",
         "title": "Feedback survey",
         "time": "About 1 minute",
         "description": "This was the second SPT survey, what a valuable use of 20 minutes that was.",
-        "farewell": "You knew the first survey didnt do anything yet you still submitted the second one, you're quite an odd one."
+        "farewell": "You knew the first survey didn't do anything yet you still submitted the second one, you're quite an odd one."
       }
     },
     "survey": {

Libraries/SPTarkov.Server.Assets/SPT_Data/configs/inventory.json

@@ -1594,7 +1594,7 @@
     "allowBossItems": false
   },
   "customMoneyTpls": [],
-  "skillGainMultiplers": {
+  "skillGainMultipliers": {
     "Strength": 1
   },
   "deprioritisedMoneyContainers": [