exercises
See https://git-mastery.org/lessons/mergeConflicts/exercise-conflict-mediator.html