merge conflict

Author: osse101

region/norfair/east/Red Pirate Shaft.json

@@ -211,7 +211,7 @@
             }},
             "canCarefulJump",
             {"or": [
-              "canWalljump",
+              "canWallJump",
               "HiJump",
               "SpaceJump",
               "canTrickySpringBallJump",
@@ -259,7 +259,7 @@
           "canUseGrapple"
         ]},
         {"or": [
-          "canWalljump",
+          "canWallJump",
           "HiJump",
           "SpaceJump",
           "canSpringBallJumpMidAir"