[DF-5249] fix merge error