GitHub repository: philipwerner/merge-exercise
Created: 2017-07-28T20:16:05Z
Description: merge conflict exercise