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