[release-18.0] simplify merging logic (#16525) · vitessio/vitess@ad9290c

running (try 1/3)...

PASSED in 1m46.2s

The `python-version` input is not set. The version of Python currently in `PATH` will be used.