Propagating a Conflict Resolution

Since the conflicts are resolved in the context of activities, the conflict resolutions can also be propagated or integrated into other workspaces.