fix: resolve merge conflict in streaming code

src/server/mod.rs

@@ -283,10 +283,6 @@ async fn chat_completions(
                 // Many OpenAI-compatible clients expect a terminal [DONE] marker.
                 // Emit it when the upstream stream ends to avoid clients treating
                 // the response as incomplete.
-<<<<<<< HEAD
-                // Convert to a Vec first, then append [DONE], then stream it
-=======
->>>>>>> refs/remotes/origin/main
                 let done_event = Ok::<Event, AppError>(Event::default().data("[DONE]"));
                 let done_stream = futures::stream::iter(vec![done_event]);
                 let out = sse_stream.chain(done_stream);