resolve-merge-conflicts
INSTALLATION
$
npx skills add https://github.com/warpdotdev/common-skills --skill resolve-merge-conflicts