[release-19.0] simplify merging logic (#16525) #16532
+45
−39
Merged
Loading