finish teacher_skills pages
reconcile merge