lab1_git: 1.3 MergeConflict.txt changed JAck and Jill to Jane and Joe