squash commits on main

[Mihai Budiu]

I apologize for merging a PR without squashing commits.
I plan to fix the main branch, hopefully I won't break anyone's workflow.

Thank you,
Mihai