GitHub repository: nickcannariato/merge-conflict-test
Created: 2019-02-15T00:20:03Z
Description: This is a test of git merge conflicts