School updates
Fixed conflicts
School updates