Fixed merge conflicts

Author: martindevans

LLama.Examples/NewVersion/CodingAssistant.cs

@@ -31,7 +31,7 @@ public static async Task Run()
             };
             using var model = LLamaWeights.LoadFromFile(parameters);
             using var context = model.CreateContext(parameters);
-            var executor = new InstructExecutor(context, null!, InstructionPrefix, InstructionSuffix);
+            var executor = new InstructExecutor(context, InstructionPrefix, InstructionSuffix, null);
 
             Console.ForegroundColor = ConsoleColor.Yellow;
             Console.WriteLine("The executor has been enabled. In this example, the LLM will follow your instructions." +

LLama/LLamaExecutorBase.cs

@@ -75,8 +75,9 @@ public abstract class StatefulExecutorBase : ILLamaExecutor
         /// </summary>
         /// <param name="context"></param>
         /// <param name="logger"></param>
-        protected StatefulExecutorBase(LLamaContext context)
+        protected StatefulExecutorBase(LLamaContext context, ILogger? logger = null)
         {
+            _logger = logger;
             Context = context;
             _pastTokensCount = 0;
             _consumedTokensCount = 0;