fifthrepos Session 5 merging with conflicts. This project is to illustrate the merging conflicts with multipls developers. 123312