Repo for teaching merge conflicts