fix display school name error format
fix merge