GitHub repository: Atmosera-dev-prep/conflict-practice-jpatmosera
Created: 2023-03-02T11:47:00Z
Description: Let's resolve some conflicts.