Revert to original MergeConflict file