fix missed conflict in 4.2.2 merge