Tried to resolve dependency issues