Resolve merge conflicts with Claude Code | Hacker News Reader