resolve-conflicts — Agent Skill for Coding | Genaihub