Fix merge conflicts

packages/components/nodes/llms/Cohere/Cohere.svg

@@ -0,0 +1 @@
+<svg width="32" height="32" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M11.776 18.304c.64 0 1.92-.032 3.712-.768 2.08-.864 6.176-2.4 9.152-4 2.08-1.12 2.976-2.592 2.976-4.576 0-2.72-2.208-4.96-4.96-4.96h-11.52A7.143 7.143 0 0 0 4 11.136c0 3.936 3.008 7.168 7.776 7.168Z" fill="#39594D"/><path fill-rule="evenodd" clip-rule="evenodd" d="M13.728 23.2c0-1.92 1.152-3.68 2.944-4.416l3.616-1.504C23.968 15.776 28 18.464 28 22.432A5.572 5.572 0 0 1 22.432 28h-3.936c-2.624 0-4.768-2.144-4.768-4.8Z" fill="#D18EE2"/><path d="M8.128 19.232A4.138 4.138 0 0 0 4 23.36v.544C4 26.144 5.856 28 8.128 28a4.138 4.138 0 0 0 4.128-4.128v-.544c-.032-2.24-1.856-4.096-4.128-4.096Z" fill="#FF7759"/></svg>

packages/components/nodes/llms/Cohere/Cohere.ts

@@ -1,7 +1,7 @@
+import { BaseCache } from '@langchain/core/caches'
 import { ICommonObject, INode, INodeData, INodeParams } from '../../../src/Interface'
 import { getBaseClasses, getCredentialData, getCredentialParam } from '../../../src/utils'
 import { Cohere, CohereInput } from './core'
-import { BaseCache } from 'langchain/schema'
 
 class Cohere_LLMs implements INode {
     label: string
@@ -20,7 +20,7 @@ class Cohere_LLMs implements INode {
         this.name = 'cohere'
         this.version = 2.0
         this.type = 'Cohere'
-        this.icon = 'cohere.png'
+        this.icon = 'Cohere.svg'
         this.category = 'LLMs'
         this.description = 'Wrapper around Cohere large language models'
         this.baseClasses = [this.type, ...getBaseClasses(Cohere)]

packages/components/nodes/llms/Cohere/core.ts

@@ -1,4 +1,4 @@
-import { LLM, BaseLLMParams } from 'langchain/llms/base'
+import { LLM, BaseLLMParams } from '@langchain/core/language_models/llms'
 
 export interface CohereInput extends BaseLLMParams {
     /** Sampling temperature to use */