video link to question
video link to question
fixed merge conflict on question show page