GitHub repository: EmeryP/mc-exercise
Created: 2018-03-23T20:37:33Z
Description: Merge conflict  exercise