fix merge issue with timer