GitHub repository: ALDOT-Training/conflict-practice-Marbc88
Primary language: JavaScript
Description: Let's resolve some conflicts.