Snapshot:

conflict mediation