fix merge Time fails