merge conflicts and indentation error

Author: Khauneesh-AI

app/main.py

@@ -433,7 +433,7 @@ def _flatten(d: dict, parent_key:str = "", sep:str=".") -> dict:
     ext = os.path.splitext(path)[1].lower()
     try:
         if ext == ".json":
-          with open(path) as f:
+            with open(path) as f:
                 raw = json.load(f)
 
             if isinstance(raw, list):