Merge conflict fixing

fixed merge conflicts on quizzes