(Bug 41352) Provide tests for edit conflicts.