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