Test updates from union changes
Fixing merge conflicts