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