[data editing]
The process of solving uncertainty within a database that occurs when two versions of the same data are edited at the same time. Conflicts can occur when multiple users simultaneously edit the same feature or topologically related features, or reconcile two versions of a dataset. Resolving a conflict requires that the user make a decision about the feature's correct representation and identify it in the Conflict Resolution dialog box.