fix: improve openapi join conflict resolution and validation#45

TristanSpeakEasy merged 2 commits intomainspeakeasy-api/openapi:mainfrom

fix/openapi-join-conflict-resolutionspeakeasy-api/openapi:fix/openapi-join-conflict-resolutionCopy head branch name to clipboard