Fix dependency resolution errors duplicate class. . ...

Fix dependency resolution errors duplicate class. .

Fix dependency resolution errors duplicate class. . ...Fix dependency resolution errors duplicate class. . ...