updating dependencies versions
fixing conflicts