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