Multiple types in the workspace
Merged conflicts