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