Resolve Conflicts Step Conflict detection is based on local policy User may decide how to resolve a conflict A separate policy may be defined for any given element, or for all elements not covered by another policy When several resolution policies are defined for an element, they are tried in order until one succeeds The default policy is to keep both conflicting tuples |