GitHub repository: punits-gh-training/conflict-practice-punitkshah
Primary language: JavaScript
Description: Let's resolve some conflicts.