Merge conflict cleanup

Author: aquanight

region/lowernorfair/east/Lower Norfair Fireflea Room.json

@@ -756,6 +756,73 @@
       "clearsObstacles": ["A"],
       "flashSuitChecked": true
     },
+    {
+      "link": [2, 2],
+      "name": "Come in Shinecharged - Gain Flash Suit (Spikesuit)",
+      "entranceCondition": {
+        "comeInShinecharged": {}
+      },
+      "requires": [
+        {"shineChargeFrames": 75},
+        {"spikeHits": 1},
+        "h_spikeSuitSpikeHitLeniency",
+        "canSpikeSuit",
+        {"shinespark": {"frames": 4}}
+      ],
+      "note": [
+        "Precise timing is required to dodge the fune's fireballs."
+      ],
+      "flashSuitChecked": true
+    },
+    {
+      "link": [2, 2],
+      "name": "Gain Flash Suit (Spikesuit) - Leave with Shinespark",
+      "requires": [
+        "canUseFlashSuitInitialSpark",
+        {"obstaclesCleared": ["A"]},
+        {"canShineCharge": {"usedTiles": 20, "gentleDownTiles": 2, "openEnd": 1}},
+        {"spikeHits": 1},
+        "h_spikeSuitSpikeHitLeniency",
+        "canSpikeSuit",
+        {"shinespark": {"frames": 11}}
+      ],
+      "exitCondition": {
+        "leaveWithSpark": {
+          "position": "bottom"
+        }
+      },
+      "unlocksDoors": [
+        {"types": ["ammo"], "requires": []}
+      ],
+      "flashSuitChecked": true
+    },
+    {
+      "link": [2, 2],
+      "name": "Come in Shinecharged - Gain Blue Suit (X-Mode)",
+      "entranceCondition": {
+        "comeInShinecharged": {}
+      },
+      "requires": [
+        {"shineChargeFrames": 155},
+        "h_spikeXModeBlueSuit",
+        {"shinespark": {"frames": 1}}
+      ],
+      "note": [
+        "Precise timing is required to dodge the fune's fireballs."
+      ],
+      "flashSuitChecked": true
+    },
+    {
+      "link": [2, 2],
+      "name": "Gain Blue Suit (X-Mode)",
+      "requires": [
+        {"obstaclesCleared": ["A"]},
+        {"canShineCharge": {"usedTiles": 20, "gentleDownTiles": 2, "openEnd": 1}},
+        "h_spikeXModeBlueSuit",
+        {"shinespark": {"frames": 1}}
+      ],
+      "flashSuitChecked": true
+    },
     {
       "link": [2, 3],
       "name": "R-Mode Pause Abuse Spark Interrupt (Gain Blue Suit)",
@@ -845,71 +912,6 @@
       "devNote": [
         "FIXME: Notable strat 'Morph Over The Fune' for getting over the secret fune (and then R-Jump to get out) isn't included."
       ]
-      "link": [2, 2],
-      "name": "Come in Shinecharged - Gain Flash Suit (Spikesuit)",
-      "entranceCondition": {
-        "comeInShinecharged": {}
-      },
-      "requires": [
-        {"shineChargeFrames": 75},
-        {"spikeHits": 1},
-        "h_spikeSuitSpikeHitLeniency",
-        "canSpikeSuit",
-        {"shinespark": {"frames": 4}}
-      ],
-      "note": [
-        "Precise timing is required to dodge the fune's fireballs."
-      ],
-      "flashSuitChecked": true
-    },
-    {
-      "link": [2, 2],
-      "name": "Gain Flash Suit (Spikesuit) - Leave with Shinespark",
-      "requires": [
-        "canUseFlashSuitInitialSpark",
-        {"obstaclesCleared": ["A"]},
-        {"canShineCharge": {"usedTiles": 20, "gentleDownTiles": 2, "openEnd": 1}},
-        {"spikeHits": 1},
-        "h_spikeSuitSpikeHitLeniency",
-        "canSpikeSuit",
-        {"shinespark": {"frames": 11}}
-      ],
-      "exitCondition": {
-        "leaveWithSpark": {
-          "position": "bottom"
-        }
-      },
-      "unlocksDoors": [
-        {"types": ["ammo"], "requires": []}
-      ],
-      "flashSuitChecked": true
-    },
-    {
-      "link": [2, 2],
-      "name": "Come in Shinecharged - Gain Blue Suit (X-Mode)",
-      "entranceCondition": {
-        "comeInShinecharged": {}
-      },
-      "requires": [
-        {"shineChargeFrames": 155},
-        "h_spikeXModeBlueSuit",
-        {"shinespark": {"frames": 1}}
-      ],
-      "note": [
-        "Precise timing is required to dodge the fune's fireballs."
-      ],
-      "flashSuitChecked": true
-    },
-    {
-      "link": [2, 2],
-      "name": "Gain Blue Suit (X-Mode)",
-      "requires": [
-        {"obstaclesCleared": ["A"]},
-        {"canShineCharge": {"usedTiles": 20, "gentleDownTiles": 2, "openEnd": 1}},
-        "h_spikeXModeBlueSuit",
-        {"shinespark": {"frames": 1}}
-      ],
-      "flashSuitChecked": true
     },
     {
       "id": 10,