Fixed multiple modules

Also changed utils.consolidate to utils.merge.