Fixed merge bugs. Re-added floor and ceiling layers. Re-added WORLD, PLAYER, ENEMY, WEAPON, layers and their interactions.
Fixed some merge bugs.