further date range validation tests and conflict method change