finish resolving conflicts

Author: blkerby

region/maridia/outer/Fish Tank.json

@@ -2992,7 +2992,6 @@
             {"cycleFrames": 1600}
           ]}
         ]},
-<<<<<<< HEAD
         {"or": [
           "canWalljump",
           {"cycleFrames": 90}
@@ -3010,11 +3009,6 @@
       ],
       "devNote": [
         "FIXME: there are other, slower ways to farm here, e.g. without Gravity."
-=======
-        {"resetRoom": {"nodes": [2, 3]}},
-        {"partialRefill": {"type": "Energy", "limit": 200}},
-        {"partialRefill": {"type": "Missile", "limit": 8}}
->>>>>>> upstream/master
       ]
     },
     {