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