resolving-merge-conflicts: Claude Code and agent skill by ninehills/skills | Verified Skill