proper time conflict handling