Fixes #224: UnitContainers were not considered when merging stacks