merged addons and modules