GitHub repository: HassanAmirii/skills-resolve-merge-conflicts
Description: resolving merge conflict