GitHub repository: malec-palec/gh-developer-conflict-practice
Primary language: JavaScript
Description: Let's resolve some conflicts.