Implementing (and learning) clientintake-caregiver search
Fixing merge conflicts...