issue #19261: Change how conflict checks are handled