fix questions.json merge conflicts