Merge modules, multiple inheritance, and scope additions