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