fixed classroom editing bug
merge