fixed weaviate test and fixed conflicts

scripts/memory/__init__.py

@@ -1,4 +1,5 @@
 from memory.local import LocalCache
+from memory.no_memory import NoMemory
 
 # List of supported memory backends
 # Add a backend to this list if the import attempt is successful
@@ -47,6 +48,9 @@ def get_memory(cfg, init=False):
         else:
             memory = WeaviateMemory(cfg)
             
+    elif cfg.memory_backend == "no_memory":
+        memory = NoMemory(cfg)
+
     if memory is None:
         memory = LocalCache(cfg)
         if init:
@@ -63,4 +67,5 @@ __all__ = [
     "RedisMemory",
     "PineconeMemory",
     "WeaviateMemory"
+    "NoMemory"
 ]