fixed single page quiz MC
fixed merge conflicts