update for new module merge strategy