fix incorrect merge, #39487