Solve merge conflicts

in 23 minutes and 38 seconds, using 0 compute credits, and was queued for 2 seconds