fixed conflicts

scripts/memory/__init__.py

@@ -57,6 +57,7 @@ def get_memory(cfg, init=False):
             memory.clear()
     return memory
 
+
 def get_supported_memory_backends():
     return supported_memory
 

scripts/memory/base.py

@@ -3,7 +3,6 @@ import abc
 from config import AbstractSingleton, Config
 import openai
 
-cfg = Config()
 
 def get_ada_embedding(text):
     text = text.replace("\n", " ")