Fix merging conflict modules/puppet/manifests/params.pp