From 5ea637e42cc40fc047344026f72d784a7d50c1c6 Mon Sep 17 00:00:00 2001
From: Olivier Chafik <ochafik@google.com>
Date: Tue, 21 May 2024 18:12:36 +0100
Subject: [PATCH] openai: fix merge

---
 examples/server/utils.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/server/utils.hpp b/examples/server/utils.hpp
index 8fbc42fbb..3cdbe0a09 100644
--- a/examples/server/utils.hpp
+++ b/examples/server/utils.hpp
@@ -385,7 +385,7 @@ static json oaicompat_completion_params_parse(
 
     std::string extra_system_message;
     // Apply chat template to the list of messages
-    llama_params["prompt"] = format_chat(model, chat_template, body.at("messages"));
+    llama_params["prompt"] = format_chat(model, chat_template, body.at("messages"), extra_system_message);
 
     // Handle "stop" field
     if (body.contains("stop") && body.at("stop").is_string()) {