resolve-conflicts - Claude Code Skill | AgentSkill