changed get_times
resolved conflict