Resolving conflict on puppet
More Documentation