[Wikitech-l] New interface for edit conflicts