fix small merge conflict in questions controller