Added the code for collisiondetection calculating if player is on top or on side
Fixed merge