[#48293087] fix merging error