[#54153918] Fix merge conflict