[#64497136] Fixed merge conflicts.