fix merge in blockTimes, change time output in log.pl