merged activites
Fix SetupQuiz Conflict