GitHub repository: lfraile-git-school/conflict-practice-lfraile
Primary language: JavaScript
Description: Let's resolve some conflicts.