Finally done with time conflicts