Fix commit merge
Better hitbox