diff --git a/Dockerfile b/Dockerfile
index 5379551..bc2407e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 #(Base Image)
 FROM python:3.11-slim
 
@@ -12,31 +11,10 @@ RUN pip install --no-cache-dir -r requirements.txt
 #(Copy all files after install dependancies)
 COPY . .
 
+
 #(Port my app listen to )
 EXPOSE 8000
 
 #(Run app/file)
 CMD ["uvicorn", "API:app", "--host", "0.0.0.0", "--port", "8000", "--log-config", "Log.yaml"]
 
-=======
-#(Base Image)
-FROM python:3.11-slim
-
-#(here /app mean name in the fastAPI i used)
-WORKDIR /app
-
-#(Copy and Install Dependancies/Libraries)
-COPY requirements.txt .
-RUN pip install --no-cache-dir -r requirements.txt
-
-#(Copy all files after install dependancies)
-COPY . .
-
-
-#(Port my app listen to )
-EXPOSE 8000
-
-#(Run app/file)
-CMD ["uvicorn", "API:app", "--host", "0.0.0.0", "--port", "8000", "--log-config", "Log.yaml"]
-
->>>>>>> origin/scripts