Clean up git merge on Game.cpp added assets

assets/maps/kaiju-city-map.tiled-session

@@ -20,11 +20,14 @@
             "scaleInEditor": 4
         },
         "kaiju-city-map.json": {
-            "scale": 3,
-            "selectedLayer": 1,
+            "expandedObjectLayers": [
+                3
+            ],
+            "scale": 4,
+            "selectedLayer": -1,
             "viewCenter": {
-                "x": 86.16666666666666,
-                "y": 10.666666666666671
+                "x": 132.75,
+                "y": 137.875
             }
         },
         "kaiju-city-map.json#kaiju-city": {
@@ -34,10 +37,13 @@
             "scale": 1.4114285714285715,
             "selectedLayer": 0,
             "viewCenter": {
-                "x": 232.38866396761134,
-                "y": 218.21862348178138
+                "x": 232.3886639676113,
+                "y": 218.57287449392717
             }
         },
+        "kaiju-city-map.tmj#kaiju-city": {
+            "scaleInDock": 1
+        },
         "kaiju-city-map.tmx": {
             "scale": 1.4114285714285715,
             "selectedLayer": 0,
@@ -83,14 +89,14 @@
     ],
     "project": "kaiju-city-map.tiled-project",
     "recentFiles": [
+        "kaiju-city-map.json",
+        "kaiju-city-map.tmj",
+        "kaiju-city.tsj",
         "testmap.json",
         "kaiju-tokyo.tsj",
-        "kaiju-city-map.json",
         "kaiju-city.tsx",
         "br-tiles.tsj",
-        "kaiju-city-map.tmx",
-        "kaiju-city-map.tmj",
-        "kaiju-city.tsj"
+        "kaiju-city-map.tmx"
     ],
     "tileset.lastUsedFilter": "JSON tileset files (*.tsj *.json)",
     "tileset.lastUsedFormat": "json",