Fixed merge conflicts in TimeUtil