add api for teachers
fix conflicts