GitHub repository: mceciabate/skills-resolve-merge-conflicts
Description: Merge conflicts