GitHub repository: robcreel/demomerge
Created: 2020-01-04T16:45:27Z
Description: Try to demo a merge conflict