Implemented collision detection between mario and ground
merge resolve