Resolve merge conflicts with Claude Code · HackerTrans