Solve merge conflict

4 jobs for master
in 3 minutes and 1 second, using 0 compute credits, and was queued for 3 minutes and 10 seconds