Resolve decadal conflicts after merge revert

in 34 minutes and 17 seconds, using 0 compute credits, and was queued for 2 seconds
latest