Fixed study hall names
Fixed merge conflicts