From b0ceae881c6762053343daf75f1556b55bde9e13 Mon Sep 17 00:00:00 2001
From: kunal-vaishnavi <115581922+kunal-vaishnavi@users.noreply.github.com>
Date: Thu, 13 Nov 2025 22:44:24 -0800
Subject: [PATCH 1/2] Fix merge conflict errors

---
 examples/csharp/HelloPhi/Program.cs | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/examples/csharp/HelloPhi/Program.cs b/examples/csharp/HelloPhi/Program.cs
index fe0895744b..c5d731017e 100644
--- a/examples/csharp/HelloPhi/Program.cs
+++ b/examples/csharp/HelloPhi/Program.cs
@@ -155,10 +155,14 @@ static string GetPrompt(bool interactive)
             using var generator = new Generator(model, generatorParams);
             generator.AppendTokenSequences(sequences);
             var watch = System.Diagnostics.Stopwatch.StartNew();
-            while (!generator.IsDone())
+            while (true)
             {
                 generator.GenerateNextToken();
-                Console.Write(tokenizerStream.Decode(generator.GetNextTokens()[0]));
+                if (generator.IsDone())
+                {
+                    break;
+                }
+                Console.Write(stream.Decode(generator.GetNextTokens()[0]));
             }
             Console.WriteLine();
             watch.Stop();
@@ -192,10 +196,14 @@ static string GetPrompt(bool interactive)
         var sequences = tokenizer.Encode(tokenizer.ApplyChatTemplate("", messages, "", true));
         var watch = System.Diagnostics.Stopwatch.StartNew();
         generator.AppendTokenSequences(sequences);
-        while (!generator.IsDone())
+        while (true)
         {
             generator.GenerateNextToken();
-            Console.Write(tokenizerStream.Decode(generator.GetNextTokens()[0]));
+            if (generator.IsDone())
+            {
+                break;
+            }
+            Console.Write(stream.Decode(generator.GetNextTokens()[0]));
         }
         Console.WriteLine();
         watch.Stop();

From b797c6f32a8c07c230fc61038a483d69c40f481d Mon Sep 17 00:00:00 2001
From: kunal-vaishnavi <115581922+kunal-vaishnavi@users.noreply.github.com>
Date: Thu, 13 Nov 2025 22:52:22 -0800
Subject: [PATCH 2/2] Fix variable typo

---
 examples/csharp/HelloPhi/Program.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/csharp/HelloPhi/Program.cs b/examples/csharp/HelloPhi/Program.cs
index c5d731017e..c23ab9907c 100644
--- a/examples/csharp/HelloPhi/Program.cs
+++ b/examples/csharp/HelloPhi/Program.cs
@@ -162,7 +162,7 @@ static string GetPrompt(bool interactive)
                 {
                     break;
                 }
-                Console.Write(stream.Decode(generator.GetNextTokens()[0]));
+                Console.Write(tokenizerStream.Decode(generator.GetNextTokens()[0]));
             }
             Console.WriteLine();
             watch.Stop();
@@ -203,7 +203,7 @@ static string GetPrompt(bool interactive)
             {
                 break;
             }
-            Console.Write(stream.Decode(generator.GetNextTokens()[0]));
+            Console.Write(tokenizerStream.Decode(generator.GetNextTokens()[0]));
         }
         Console.WriteLine();
         watch.Stop();