GitHub repository: winson-itpro2-com/conflict-practice-JerrySHek
Primary language: JavaScript
Description: Let's resolve some conflicts.