test fix for merge

parent 6904fccd
Pipeline #187507 failed with stages
in 44 seconds