fix conflict errors

Author: kjbranch

region/crateria/east/West Ocean.json

@@ -2801,9 +2801,9 @@
     {
       "id": 135,
       "link": [17, 16],
-      "name": "West Ocean G-mode Overload PLMs by PBing Missile Item Softlock Risk",
+      "name": "G-mode Overload PLMs by PBing Missile Item Softlock Risk",
       "requires": [
-        {"notable": "West Ocean G-mode Overload PLMs by PBing Missile Item"},
+        {"notable": "G-mode Overload PLMs by PBing Missile Item"},
         "canEnterGMode",
         {"itemNotCollectedAtNode": 10},
         "canRiskPermanentLossOfAccess",

region/crateria/west/Gauntlet Energy Tank Room.json

@@ -442,7 +442,7 @@
       "link": [1, 3],
       "name": "Blue Suit",
       "requires": [
-        {"notable": "Gauntlet E-Tank R-Mode Blue Suit"},
+        {"notable": "R-Mode Blue Suit"},
         {"obstaclesCleared": ["D"]},
         "Morph",
         {"or": [
@@ -923,7 +923,7 @@
       "link": [3, 1],
       "name": "Blue Suit",
       "requires": [
-        {"notable": "Gauntlet E-Tank R-Mode Blue Suit"},
+        {"notable": "R-Mode Blue Suit"},
         {"obstaclesCleared": ["D"]},
         "Morph",
         {"or": [
@@ -945,7 +945,7 @@
       "link": [3, 2],
       "name": "Leave Shinecharged, Blue Suit",
       "requires": [
-        {"notable": "Gauntlet E-Tank R-Mode Blue Suit"},
+        {"notable": "R-Mode Blue Suit"},
         {"obstaclesCleared": ["D"]}
       ],
       "exitCondition": {

region/lowernorfair/west/Screw Attack Room.json

@@ -625,15 +625,15 @@
     },
     {
       "link": [2, 3],
-      "name": "Screw Attack Room Transition Screwjump (Tricky Jump)",
+      "name": "Transition Screwjump (Tricky Jump)",
       "entranceCondition": {
         "comeInRunning": {
           "minTiles": 5.4375,
           "speedBooster": true
         }
       },
       "requires": [
-        {"notable": "Screw Attack Room Transition Screwjump"},
+        {"notable": "Transition Screwjump"},
         "h_canNavigateHeatRooms",
         "ScrewAttack",
         "HiJump",
@@ -646,15 +646,15 @@
     },
     {
       "link": [2, 3],
-      "name": "Screw Attack Room Transition Screwjump (No Walljump)",
+      "name": "Transition Screwjump (No Walljump)",
       "entranceCondition": {
         "comeInRunning": {
           "minTiles": 7,
           "speedBooster": true
         }
       },
       "requires": [
-        {"notable": "Screw Attack Room Transition Screwjump"},
+        {"notable": "Transition Screwjump"},
         "h_canNavigateHeatRooms",
         "ScrewAttack",
         "HiJump",

region/maridia/inner-pink/Botwoon's Room.json

@@ -530,9 +530,9 @@
     },
     {
       "link": [2, 2],
-      "name": "Back-Side Botwoon Microwave",
+      "name": "Back-Side Microwave",
       "requires": [
-        {"notable": "Back-Side Botwoon Fight with Charge and Wave"},
+        {"notable": "Back-Side Fight with Charge and Wave"},
         "h_canNavigateUnderwater",
         "Charge",
         "Plasma",