Resolved merge conflicts

2 jobs for dev-cross-indices
in 12 minutes and 48 seconds, using 0 compute credits, and was queued for 2 seconds
latest