Fixed ZE game
Fixed merge