fix school code
fix conflict
Merge branch 'minzu_dev_beta' into minzu