add teacher img
save code
fix conflict