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