[#71400514] Fix merge conflict error.