conflict resolved source vs target

in 13 minutes and 48 seconds, using 0 compute credits, and was queued for 1 second