conflictResolution: Difference between revisions