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