fix merge conflicts

Author: kjbranch

region/norfair/crocomire/Crocomire's Room.json

@@ -359,7 +359,7 @@
     },
     {
       "id": 17,
-      "link": [3, 6],
+      "link": [3, 4],
       "name": "HiJump Acid Bath",
       "requires": [
         {"acidFrames": 75}
@@ -377,7 +377,7 @@
       ]
     },
     {
-      "link": [3, 6],
+      "link": [3, 4],
       "name": "Acid Bath, Use Flash Suit",
       "requires": [
         {"acidFrames": 55},
@@ -388,7 +388,7 @@
       "note": "Jump in the acid multiple times and spark diagonally during the last jump."
     },
     {
-      "link": [3, 6],
+      "link": [3, 4],
       "name": "Long Horizontal Spark, Use Flash Suit",
       "requires": [
         {"useFlashSuit": {}},
@@ -691,7 +691,7 @@
       "note": "With a precise enough jump and a quick airball, it's possible to avoid acid damage without a shinespark or wall jump."
     },
     {
-      "link": [6, 3],
+      "link": [4, 3],
       "name": "Use Flash Suit",
       "requires": [
         {"useFlashSuit": {}},