lab2 1.5 changes in MergeConflict.txt from first/master repo