Forgot to remove this in conflict resolution
Forgot to remove this in conflict resolution

pshowalter/solutions-geoprocessing-toolbox,jfrygeo/solutions-geoprocessing-toolbox,jfrygeo/solutions-geoprocessing-toolbox,Esri/solutions-geoprocessing-toolbox,jfrygeo/solutions-geoprocessing-toolbox,pshowalter/solutions-geoprocessing-toolbox,pshowalter/solutions-geoprocessing-toolbox