new conflict resolution, using an intermediate actor 'ConflictManager' that coordinates workers.
New conflict resolution - remaining files.
fixed all strategy.
Fixing the hybrid strategy, and allowing a fixed set of priority ports to be passed in.
Fixed bug in conflict resolution protocol - claimed node being lost.