fixed an SQL bug in WorkspaceInstance
merge control