GitHub repository: ps-developers-sandbox/conflict-practice-DanielMacAZ
Created: 2023-05-31T10:40:43Z
Description: Let's resolve some conflicts.