Fixed conflict in pulp-puppet.spec