update time_card
resolved conflict