Resolve Conflicting Transitive Dependencies

Assembly failed because of conflicting classes in multiple jars.

/cc @gklopper