GitHub repository: shreyasbaranwal/conflict-practice-halerd11
Description: Let's resolve some conflicts.