hegemonart

Conflict Resolver — Design agent for Claude Code

Design community

Resolves design-artifact merge conflicts when two developers worked a cycle on parallel branches.

How to install Conflict Resolver

Installs to ~/.claude/agents/hegemonart-ultimate-design-conflict-resolver.md

Terminal

mkdir -p ~/.claude/agents && curl -fsSL https://raw.githubusercontent.com/hegemonart/ultimate-design/HEAD/agents/conflict-resolver.md -o ~/.claude/agents/hegemonart-ultimate-design-conflict-resolver.md

Restart Claude Code, or start a new session, for it to be picked up.

What Conflict Resolver does

name: conflict-resolver description: Resolves design-artifact merge conflicts when two developers worked a cycle on parallel branches. Reads the conflicted STATE.md from both sides (ours/theirs) plus the merge base, runs the pure scripts/lib/collab/section-merge.cjs per-section semantic merge (union the by D-id; a real conflict is only a same-id divergence), and proposes a resolution PER SECTION for explicit human confirmation. Never auto-commits a conflicted section - decisions

Alternatives in Design

Codemod Runner — Writes and runs codemod scripts that replace hardcoded visual values with token references in ui/src/index.css 79.4k ★
Software Architect — Resolves contested design questions against the specs; decision + rationale, never code 16.1k ★
Repurpose Visual — Visual content specialist 139 ★