MT#5879 Fix Merge error