GitHub repository: ps-developers-sandbox/conflict-practice-gedharrison
Primary language: JavaScript
Description: Let's resolve some conflicts.