{
  "conflict_files": [
    "AGENTS.md",
    "AI_PRACTICE_SHARING.html",
    "standards-stack/README.md",
    "standards-stack/agent-skills/CODEX_TEAM_SKILL_MANIFEST.csv",
    "standards-stack/agent-skills/CODEX_TEAM_SKILL_MANIFEST.tsv",
    "standards-stack/agent-skills/README.md",
    "standards-stack/ai-engineering/AI_PRACTICE_SHARING.md",
    "standards-stack/llm-wiki/personal-collaboration/preferences.md",
    "standards-stack/prompt/AGENTS.md"
  ],
  "resolution": "Retained all remote baseline content; inserted only task-specific rule/card/manifest row and new skill. Original worktree and 9 unrelated local commits unchanged. Index regenerated from remote items plus current skill item.",
  "excluded": "Other tasks, original tender DOCX, customer URLs, screenshots/XLSX and credentials are not part of publication."
}