Solve conflicts

in 7 minutes and 43 seconds, using 0 compute credits, and was queued for 3 seconds