GitHub repository: GH-Dev-WS-0304/conflict-practice-JPHoesch
Primary language: JavaScript
Description: Let's resolve some conflicts.