[Wikitech-l] rollback conflicts