Commit the first set of changes to MergeConflict.txt (on master)