fix merge conflicts in module specs