Added checks for time conflicts