Convert to expression body: fixed type selection for public override
Buildserver auto merge