A small repo to practice fixing merge conflicts on git. - View it on GitHub