GitHub repository: Jaimeum/skills-resolve-merge-conflicts
Description: Resolver problemas en los merge