updated time conflict