changed conflict dates to sunday to saturday layout