GitHub repository: EricSoderTeach/conflict-practice-fogomes
Primary language: JavaScript
Description: Let's resolve some conflicts.