Fixed a test failure in ReportMergeConflictsOpTest.