GitHub repository: solidify-learning/conflict-practice-crisrss
Primary language: JavaScript
Description: Let's resolve some conflicts.