add caregiver and conflicts is solved