merge laps field into Penalty as new type CANCEL_LAPS