fix merge conflict
fix merge conflict
cisco/cisco-network-puppet-module,mikewiebe/cisco-network-puppet-module,cisco/cisco-network-puppet-module,mikewiebe/cisco-network-puppet-module,mikewiebe/cisco-network-puppet-module,cisco/cisco-network-puppet-module,cisco/cisco-network-puppet-module,mikewiebe/cisco-network-puppet-module