resolving-merge-conflicts: Claude Code and agent skill by j03fr0st/mithril | Verified Skill