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