Merge "Fix undefined variable in SpecialMergeHistory"