merge conflict

Author: osse101

region/norfair/east/Red Pirate Shaft.json

@@ -214,7 +214,7 @@
                 "canCarefulJump",
                 "HiJump"
               ]},
-              "canPreciseWalljump",
+              "canPreciseWallJump",
               {"and": [
                 "canDodgeWhileShooting",
                 "SpaceJump"