fixed instructor
merge