Small update QuestionScreen
Question screen update
Conflict res