Add comments to questions and answers
merge conflict on routes