resolve merge conflict in site.pp