#5270: fix missed merge conflict