merge ruling's change.