Fixed some more version conflicts

parent e8a7c0d3
Pipeline #3496 failed with stages
in 1 minute and 32 seconds