Fix build errors after merge

[rkistner]

Merging #275 + #163 caused some merge conflicts not picked up by git, but picked up as TypeScript build errors. This fixes it.

[changeset-bot]

⚠️ No Changeset found

Latest commit: 54b4b68

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR