Fix merge conflicts from tab-space problem fixing.
Fix merge conflicts from tab-space problem fixing.

SaturdayNeighborhoodHealthClinic/clintools,SaturdayNeighborhoodHealthClinic/clintools,SaturdayNeighborhoodHealthClinic/clintools