Resolve conflicts with biocommons

[bsgiles73]

Bring in latest changes from Biocommons.UTA to resolve conflicts in PR.

1. Swith to main local and get latest.
2. Add Biocommons as a remote repository
3. Create branch
4. Merge branch into local main and push to origin

git checkout main
git checkout -b biocommons-sync-2
git remote add upstream [email protected]:biocommons/uta.git
git pull upstream/main
git commit

Create and merge PR.