fix: rebase master on top of main (2nd attempt) (#103)

Co-authored-by: gitbook-bot <[email protected]>
Co-authored-by: Aimen Sahnoun <[email protected]>

Author: 3 people