Fix merge conflicts

3 jobs for master in 7 minutes and 44 seconds (queued for 1 second)
latest Auto DevOps