fix other merge in putparams.m