合并冲突

npx skills add https://github.com/mattpocock/skills --skill "resolving-merge-conflicts"