[DF-2822] fix merge issue