Resolve conflicts

in 3 minutes and 17 seconds, using 0 compute credits, and was queued for 7 minutes and 4 seconds
latest