ci: fix conflict in cherry pick

5 jobs for !552 with slb/cherry-pick-fix-axios-2 in 27 minutes and 37 seconds (queued for 2 seconds)
latest merge request