Merge pull request #32 from ddewaele/bugfix_resourceEqualConflictsByArtifactNames

fixing the found duplicate and different resources flow
Merge remote-tracking branch 'upstream/master'