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