Used to test git merge conflicts for the Git Conflict Bot.
To generate conflicts:
git clone git@github.com:nickFalcone/conflicted-repo.git
cd conflicted-repo/
git checkout master
git pull origin conflicts
# CONFLICT (content): Merge conflict in lorem.txt
# Automatic merge failed; fix conflicts and then commit the r