Conflict Dialog Box should be
1. merged with Version Changes Box (eg. not limited to reconcile),
2. allow functionality even if only changes to one version has occured, not requiring changes in both the edit version and target versions.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.