adding username to therapists
fix merge conflicts