separating containers
merging master