Change solveCollisions to return collided entities