Implemented getClinics()
Fixed merge error