Solve conflicts

4 jobs for master
in 3 minutes and 42 seconds, using 0 compute credits, and was queued for 8 seconds