---
uai: "1.0"
type: topic-memory
status: active
project: iarpg.com
release: "IARPG-OPS-2"
version: "2.0.27-wip"
review_state: current-until-superseded
---

# Conflict-Aware Operation Package Merge

## Purpose

Preserve both source packages while requiring a reviewable decision for every conflicting mission, role, evidence, handoff, list, scalar, or extension value.

## Current doctrine

- The public merge workbench is `/merge`; the machine contract is `/package-merge.schema.json`.
- Every conflict records both source paths, both values, the proposed action, applicable standard, and final selected result.
- Values found on only one side are preserved; unknown extensions survive the merge.
- Evidence items sharing an ID but differing canonically are conflicts and are never silently deduplicated.
- Role handoff logs preserve original record IDs and UTC event order.
- Merge output carries source package IDs, source digests, resolution records, and merged component digests.

## Shared Constraints

- Apply [repository constraints](constraints.uai#non-negotiable-constraints).

## Relevant standards

- https://iarpg.com/standard/conflict-aware-operation-package-merge
- https://iarpg.com/standard/evidence-custody
- https://iarpg.com/standard/role-handoffs

## Relevant mission examples

- https://iarpg.com/mission/port-access-anomaly-investigation
- https://iarpg.com/mission/cross-border-ceasefire-verification

## Deep report links

- [Intelligence Operative Archetypes and Tradecraft](../docs/long-term-memory/reports/intelligence-operative-archetypes-and-tradecraft.md#analytical-liaison-and-support-roles)
- [Trust, Deception, and Virtual Economies](../docs/long-term-memory/reports/trust-deception-and-virtual-economies.md#escrow-verification-and-reputation-systems)

## Related UAI records

- [operation-packages.uai](operation-packages.uai)
- [evidence-custody.uai](evidence-custody.uai)
- [information-asymmetry.uai](information-asymmetry.uai)