diff --git a/.planning/REQUIREMENTS.md b/.planning/REQUIREMENTS.md
index d7aa102..c08d1af 100644
--- a/.planning/REQUIREMENTS.md
+++ b/.planning/REQUIREMENTS.md
@@ -42,8 +42,8 @@ Requirements for initial release. Each maps to roadmap phases.
 
 ### Coordination
 
-- [ ] **COORD-01**: System merges agent outputs into integration branch in dependency order
-- [ ] **COORD-02**: Non-trivial merge conflicts bounce work back to agent for resolution
+- [x] **COORD-01**: System merges agent outputs into integration branch in dependency order
+- [x] **COORD-02**: Non-trivial merge conflicts bounce work back to agent for resolution
 
 ### File System UI
 
@@ -119,8 +119,8 @@ Which phases cover which requirements. Updated by create-roadmap.
 | TASK-03 | Phase 2 | Complete |
 | TASK-04 | Phase 5 | Complete |
 | TASK-05 | Phase 5 | Complete |
-| COORD-01 | Phase 6 | Pending |
-| COORD-02 | Phase 6 | Pending |
+| COORD-01 | Phase 6 | Complete |
+| COORD-02 | Phase 6 | Complete |
 | FSUI-01 | Phase 7 | Pending |
 | FSUI-02 | Phase 7 | Pending |
 | FSUI-03 | Phase 7 | Pending |
diff --git a/.planning/phases/06-coordination/06-02-SUMMARY.md b/.planning/phases/06-coordination/06-02-SUMMARY.md
new file mode 100644
index 0000000..4d78a15
--- /dev/null
+++ b/.planning/phases/06-coordination/06-02-SUMMARY.md
@@ -0,0 +1,102 @@
+---
+phase: 06-coordination
+plan: 02
+subsystem: coordination
+tags: [adapter, merge-queue, dependency-ordering, conflict-handling]
+
+# Dependency graph
+requires:
+  - phase: 06-coordination
+    plan: 01
+    provides: CoordinationManager port interface, merge events
+  - phase: 05-dispatch
+    provides: DispatchManager pattern, task events
+  - phase: 03-git
+    provides: WorktreeManager, MergeResult type
+provides:
+  - DefaultCoordinationManager adapter implementation
+  - Dependency-ordered merge processing
+  - Conflict bounce-back task creation with agent messaging
+affects: [06-03, future-coordination-cli]
+
+# Tech tracking
+tech-stack:
+  added: []
+  patterns: [in-memory queue, dependency graph resolution, conflict bounce-back]
+
+key-files:
+  created: [src/coordination/manager.ts, src/coordination/manager.test.ts]
+  modified: [src/coordination/index.ts]
+
+key-decisions:
+  - "MessageRepository is optional - conflict messages only sent if configured"
+  - "In-memory queue same pattern as DispatchManager (no persistence for v1)"
+
+patterns-established:
+  - "Conflict resolution creates high-priority task + info message to agent"
+  - "Merge queue state exposes queued/inProgress/merged/conflicted categories"
+
+# Metrics
+duration: 4min
+completed: 2026-01-30
+---
+
+# Phase 6 Plan 2: DefaultCoordinationManager Adapter Summary
+
+**Implements CoordinationManager with dependency-ordered merging and conflict bounce-back.**
+
+## Performance
+
+- **Duration:** 4 min
+- **Started:** 2026-01-30T21:05:00Z
+- **Completed:** 2026-01-30T21:09:00Z
+- **Tasks:** 3
+- **Files modified:** 3
+- **Tests added:** 18
+
+## Accomplishments
+- Implemented DefaultCoordinationManager adapter with in-memory merge queue
+- Dependency-ordered merging via getNextMergeable() and processMerges()
+- Priority ordering (high > medium > low) with FIFO within same priority
+- Conflict detection and bounce-back task creation
+- Agent messaging on conflict via optional MessageRepository
+- Comprehensive test coverage (18 tests)
+
+## Task Commits
+
+Each task was committed atomically:
+
+1. **Task 1: Implement DefaultCoordinationManager** - `6d7894b` (feat)
+2. **Task 2: Enhance conflict bounce-back** - `4535707` (feat)
+3. **Task 3: Add comprehensive tests** - `37a90db` (test)
+
+## Files Created/Modified
+- `src/coordination/manager.ts` - DefaultCoordinationManager adapter implementation
+- `src/coordination/manager.test.ts` - 18 tests covering queue, dependencies, conflicts
+- `src/coordination/index.ts` - Exports DefaultCoordinationManager
+
+## Decisions Made
+- MessageRepository is optional in constructor - conflict messages only created if available
+- In-memory queue (same pattern as DispatchManager) - no persistence needed for v1
+- System-generated messages use senderType='user' with null senderId
+
+## Deviations from Plan
+
+None - plan executed exactly as written.
+
+## Issues Encountered
+
+None
+
+## User Setup Required
+
+None - no external service configuration required.
+
+## Next Phase Readiness
+- DefaultCoordinationManager ready for integration
+- All four merge lifecycle events emitted at correct points
+- Ready for 06-03-PLAN.md (CLI commands and tRPC procedures for coordination)
+
+---
+*Phase: 06-coordination*
+*Completed: 2026-01-30*