added registration for teachers
fixed conflicts