fix merge conflicts. remove 2 unnecessary @question.body from show view