tidy up add caregiver reports
resolved conflicts add caregiver reports