Merge branch 'main' of https://github.com/zed-industries/zed