[#57063802] Fixed merge conflict.