From c90261449f0eaf8f6951c0cf4c0515a07f3a86f1 Mon Sep 17 00:00:00 2001
From: wbpxre150 <wbpxre150@outlook.com>
Date: Sat, 15 Apr 2023 09:19:46 +0800
Subject: [PATCH] fix conflict

---
 examples/main/main.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/main/main.cpp b/examples/main/main.cpp
index 8f5c0cf5c..f61a2ea4b 100644
--- a/examples/main/main.cpp
+++ b/examples/main/main.cpp
@@ -481,8 +481,8 @@ int main(int argc, char ** argv) {
                         // this was a command, so we need to stop anything more from printing. 
                         is_command = true;
                     }
-                    // insert input prefix
-                    if (!params.instruct_prefix.empty() && !antiprompt.any) {
+                    // instruct mode: insert instruction prefix
+                    if (params.instruct && !is_antiprompt) {
                         n_consumed = embd_inp.size();
                         embd_inp.insert(embd_inp.end(), inp_pfx.begin(), inp_pfx.end());
                     }