Remove the beta tag for workspace
Remove the beta tag and resolved conflict