added time conflict check