fix merge problems in time sample