Add links to edit a question
Resolve a conflict