clean comments on therapist appointment view
fix merge conflicts
fix merge conflicts