fixed conflicts

scripts/memory/no_memory.py

@@ -2,6 +2,7 @@ from typing import Optional, List, Any
 
 from memory.base import MemoryProviderSingleton
 
+
 class NoMemory(MemoryProviderSingleton):
     def __init__(self, cfg):
         """

scripts/memory/pinecone.py

@@ -4,6 +4,7 @@ from memory.base import MemoryProviderSingleton, get_ada_embedding
 from logger import logger
 from colorama import Fore, Style
 
+
 class PineconeMemory(MemoryProviderSingleton):
     def __init__(self, cfg):
         pinecone_api_key = cfg.pinecone_api_key