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