fix conflict

Author: blkerby

region/norfair/east/Lava Dive Room.json

@@ -1195,7 +1195,7 @@
         {"notable": "HiJumpless Dive"},
         "canSuitlessLavaDive",
         "canUseIFrames",
-        "canStaggeredWalljump",
+        "canTrickyWalljump",
         "canFastWalljumpClimb",
         "canUseEnemies",
         "canCameraManip",