The way I've handled that in the past to have a bit map for every attribute so the object owner can indicate which properties have changed, in some cases one si

The way I've handled that in the past to have a bit map for every attribute so the object owner can indicate which properties have changed, in some cases one side or the other is the owner of that attribute so it is accepted by default, sequence numbers can resolve other conflicts, and then custom merge logic can resolve others. Works perfectly.