Update QUESTIONS.md
resolve merge conflict
Merge branch 'iennae-patch-5'