Solve conflicts

5 jobs for dev-add_nord4
in 18 minutes and 40 seconds, using 0 compute credits, and was queued for 11 minutes and 54 seconds