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