GitHub repository: IGM-github-for-developers/conflict-practice-EnsyTehrani
Primary language: JavaScript
Description: Let's resolve some conflicts.