fix for unittest framework

Author: aseembits93

codeflash/api/aiservice.py

@@ -306,10 +306,6 @@ def log_results(  # noqa: D417
             "optimized_runtime": optimized_runtime,
             "is_correct": is_correct,
             "codeflash_version": codeflash_version,
-<<<<<<< Updated upstream
-=======
-            "best_optimization_id": best_optimization_id,
->>>>>>> Stashed changes
             "optimized_line_profiler_results": optimized_line_profiler_results,
         }
         try:

codeflash/optimization/function_optimizer.py

@@ -361,11 +361,6 @@ def determine_best_candidate(
         file_path_to_helper_classes: dict[Path, set[str]],
         exp_type: str,
     ) -> BestOptimization | None:
-<<<<<<< Updated upstream
-=======
-        # TODO remove
-
->>>>>>> Stashed changes
         best_optimization: BestOptimization | None = None
         _best_runtime_until_now = original_code_baseline.runtime
 
@@ -603,11 +598,6 @@ def determine_best_candidate(
             original_runtime=original_code_baseline.runtime,
             optimized_runtime=optimized_runtimes,
             is_correct=is_correct,
-<<<<<<< Updated upstream
-=======
-            best_optimization_id=best_optimization.candidate.optimization_id,
->>>>>>> Stashed changes
-            optimized_line_profiler_results=optimized_line_profiler_results,
         )
         return best_optimization