Managing prereleases with a component library

[inthegreenwild]

I'm new to changesets and confused on how to sanely go about managing prerelease versions of packages that depend on each other in a large component library. I want a setup where branches merged back to main with their committed change sets triggers changesets cli to automatically version and publish via CI/CD on the main branch.

Take the following example:

I have packages C and D which are both version 1.0.0. Package D depends on Package C
I want to prepare package C for a new major release but want to publish it into beta first for users to test.
I create a new beta branch for package C beta/packageC and do changeset pre enter beta
I create a changeset and version package C, which in turn bumps package D. This results in:
Package C as 2.0.0-beta.0
Package D as 1.0.1-beta.0
During beta testing, someone makes a minor change to package D and releases 1.1.0
Beta testing completes and I'm ready to merge beta/packageC branch back to main branch and exit beta

How do I deal with the merge conflicts of the package.json versions and changelog.md files? If I merge main into the beta branch, do I just take the minor bump for package D?

main ------------------package D 1.1.0 ------------------------------------------------X MERGE CONFLICT
	\ 
	beta/packageC branch --------------------------------------------------/
			\____  C 2.0.0-beta.0 ---- C 2.0.0-beta.1 ----------/ 
				   D 1.0.1-beta.0 ---- D 1.0.1-beta.1

EDIT:

I tried accepting changes from main in the beta branch where package D becomes 1.1.0 instead of 1.0.1-beta.0 but when I try running changeset version after that point, only package C is bumped. Package D remains on 1.1.0 with a dependency of the beta workspace that no longer exists. It seems the only way to fix this is to manually set package D to 1.1.1-beta.0 and then running changeset version.