Resolved merge conflict in app.py

app.py

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 import gradio as gr
 from bug_detector import fix_code
 
@@ -11,7 +10,6 @@ gr.Interface(
     outputs=gr.Textbox(label="Suggested Fixed Code"),
     title="Code Fixer using CodeT5+"
 ).launch()
-=======
 from flask import Flask, request, jsonify
 from flask_cors import CORS  # Fix CORS issue
 import torch
@@ -51,4 +49,4 @@ def detect_bug():
 
 if __name__ == "__main__":
     app.run(host="0.0.0.0", port=5000)  # Ensure compatibility with Docker
->>>>>>> 22b22edd4386cff48f5ad4c4325e1f8524238b52
+