fix conflicts for *quiz.jsp

fix conflicts for *quiz.jsp