resolving-merge-conflicts isn’t available in this repository.

It may have been renamed or removed. These skills are still published by smithery/axiomantic.