Activity diagram uml update.
Conflict resolution in SadModel ?