Update Dockerfile

Dockerfile

@@ -17,16 +17,12 @@ COPY requirements.txt .
 RUN pip install --no-cache-dir -r requirements.txt
 
 # Copy application code
-<<<<<<< HEAD
 COPY models.py      .
 COPY dataset.py     .
 COPY graders.py     .
 COPY environment.py .
 COPY server.py      .
 COPY openenv.yaml   .
-=======
-COPY server/      ./server/
->>>>>>> 2edcf255c01f84090ae86ed0a99539843d1aa61f
 COPY inference.py   .
 COPY static/        ./static/
 
@@ -42,8 +38,4 @@ ENV PORT=7860
 ENV HOST=0.0.0.0
 
 # Start the FastAPI server
-<<<<<<< HEAD
 CMD ["python", "-m", "uvicorn", "server:app", "--host", "0.0.0.0", "--port", "7860", "--workers", "1"]
-=======
-CMD ["python", "-m", "uvicorn", "server.app:uv_main", "--host", "0.0.0.0", "--port", "7860", "--workers", "1"]
->>>>>>> 2edcf255c01f84090ae86ed0a99539843d1aa61f