Knowledge merge fork

Two edits to the same concept branch into conflicting property values that can be reconciled one field at a time.

Wide diagrams scroll horizontally. All actions are available through the controls.