Learn to Solve Merge Conflict This repository serves as an exercise to resolve merge conflicts. Change into the stage-1-master branch and read README.md for further information.