Added collisionhandeling
Fixed mergeconflict