Solve conflicts and fix pipeline

in 11 minutes and 7 seconds, using 0 compute credits, and was queued for 2 seconds