feat(ultraplan): intelligent conflict resolution assistant

[Iron-Ham]

Problem

Consolidation pauses on ANY merge conflict with no guidance. Users must manually resolve conflicts without context about what each task was trying to accomplish.

Proposed Solution

When a conflict is detected, spawn a resolver Claude instance that:

1. Analyzes both sides of the conflict
2. Retrieves task descriptions to understand intent
3. Proposes a resolution that satisfies both goals
4. Shows diff in TUI for human approval

New CLI options:

• --auto-resolve - Trust Claude's resolution (for low-risk conflicts)
• --resolve-interactive - Show proposals, require approval
• --resolve-manual - Current behavior, just pause

Resolution strategies:

• Semantic merge (understand code intent, combine logically)
• Prefer-newer (trust later task's changes)
• Prefer-dependency (trust upstream task's changes)

Why It Matters

Merge conflicts are the #1 pain point in parallel development. Intelligent resolution that understands why each change was made saves hours of manual conflict resolution.

Implementation Considerations

• Resolver needs full context: task descriptions, file history, both versions
• Should categorize conflict severity (trivial formatting vs semantic)
• May want to batch related conflicts for single resolution pass
• Need clear UX for accepting/rejecting proposed resolutions

Priority

P2 - Major UX improvement for consolidation phase