fixup
mergefix
mergefix
fix editor for quiz