Fix cargo.lock merge race & pixi.lock in weird state

[teh-cmc]

Checklist

• I have read and agree to Contributor Guide and the Code of Conduct
• I've included a screenshot or gif (if applicable)
• I have tested the web demo (if applicable):
  • Using examples from latest main build: rerun.io/viewer
  • Using full set of examples from nightly build: rerun.io/viewer
• The PR title and labels are set such as to maximize their usefulness for the next release's CHANGELOG
• If applicable, add a new check to the release checklist!

• PR Build Summary
• Recent benchmark results
• Wasm size tracking

To run all checks from main, comment on the PR with @rerun-bot full-check.

[teh-cmc]

but what's happening with pixi now...

[github-actions]

Deployed docs

Commit	Link
a9539a7	https://landing-j7p9jqpgc-rerun.vercel.app/docs

[teh-cmc]

I mean it fixes the CI issue sure, but wth

[teh-cmc]

Ok I'm merging this anyhow so the CI can at least run on main -- but there are some underlying issues here