added first implementation of the ResolvConflictConsolidator