Add support for merging workspaces