resolving-merge-conflicts-zh: Claude Code and agent skill by gongyijie85/mattpocock-skills-dsh-zh | Verified Skill