A simple repo that provides two branches with a merge conflict. - View it on GitHub