Fix missing category in the JSON, based on school type
Merge some stupid conflict