Unified: merge in `main`

Keeps our version of the conflicting files. They will be regenerated in
the next commit.