issue #19552: Fix merge conflict.