Fixed conflict checking for same date/time