GitHub repository: sjl/merge-conflict-test
Description: A simple repo that provides two branches with a merge conflict.