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

This reverts commit a08ba3249edee00ca8c266b7c8bed0a5a0474bfb.