GitHub repository: AustinMower92/Technical-HW-1
Created: 2021-09-01T23:02:53Z
Description: Exercise 1.3: Solving Merge Conflict