[DF-2382] fix merge issue