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