Assertion: edit conflict | /r/HasProperty | resolved in most situations
Facets:
value: by merging the two changes
type: MANNER
Source sentences:
text: In most situations, an edit conflict can be resolved by merging the two changes to a page -- including the contributions of both editors.