reverting to original MergeConflict.txt
changing to Jane and Joe/Blue hat Purple hat MergeConflict.txt