Merged 2 workspaces