Composite differences between versions of a model
A composite difference is the aggregate of several individual but
related changes between versions of a model. If you perform one action that
creates multiple differences or conflicts, the result can appear as a single
change, which is known as a composite difference.
Conflicts between versions of a model
A conflict occurs in a team development environment when two versions
of a model contain differences that cannot both be accepted. For example,
two users rename the same class or entity with different names. These two
differences conflict because the model can only contain one of the changed
names.