Merge TeacherVC  final