corrected namespaces, add noSolutionConflict