merging changes from multi-world