Merge from workspace