Resolve merge conflicts

README.md

@@ -31,4 +31,4 @@ uvicorn app:app --host 0.0.0.0 --port 8080 --reload
 ```
 docker build -t fclip . 
 docker run -p 8080:7860 fclip
-```
+```

app.py

@@ -49,4 +49,4 @@ async def encode_images(
         app.state.req_count += 1
 
         if app.state.req_count % COLLECT_GC_EVERY == 0:
-            gc.collect()
+            gc.collect()

src/utils.py

@@ -87,4 +87,4 @@ def analyze_model_parameters(model: torch.nn.Module) -> Dict:
             }
         )
 
-    return results
+    return results