chore: resolve merge conflicts

Signed-off-by: behnazh-w <[email protected]>

Author: behnazh-w

src/macaron/build_spec_generator/build_spec_generator.py

@@ -155,7 +155,7 @@ def gen_build_spec_for_purl(
         os.path.relpath(build_spec_file_path, os.getcwd()),
     )
     rich_handler = access_handler.get_handler()
-    rich_handler.update_gen_build_spec("Build Spec Path:", os.path.relpath(build_spec_filepath, os.getcwd()))
+    rich_handler.update_gen_build_spec("Build Spec Path:", os.path.relpath(build_spec_file_path, os.getcwd()))
     try:
         with open(build_spec_file_path, mode="w", encoding="utf-8") as file:
             file.write(build_spec_content)

src/macaron/console.py

@@ -85,10 +85,6 @@ def __init__(self, *args: Any, verbose: bool = False, **kwargs: Any) -> None:
             self.find_source_table.add_row(key, value)
         self.dump_defaults: str | Status = Status("[green]Generating[/]")
         self.gen_build_spec: dict[str, str | Status] = {
-            "Package URL:": Status("[green]Processing[/]"),
-            "Repository URL:": Status("[green]Processing[/]"),
-            "Commit Hash:": Status("[green]Processing[/]"),
-            "Build Tools:": Status("[green]Processing[/]"),
             "Build Spec Path:": "Not Generated",
         }
         self.gen_build_spec_table = Table(show_header=False, box=None)