GitHub repository: vd-gh-dev-training/conflict-practice-dronkoff
Primary language: JavaScript
Description: Let's resolve some conflicts.