issue #19453: merge conflicts