fifthrepos Session 06 - Merging with conflicts This project is to illustrate the merging conflicts with multiple developers.