fixing merge on params.pp