Merge remote-tracking branch 'team/impl/sky_lauch' into impl/demo/100724

Author: chris-aeviator

src/pymc_server/commands/launch_cli.py

@@ -420,7 +420,7 @@ def launch_2(
                          no_setup=no_setup,
                          clone_disk_from=clone_disk_from)
 
-    click.secho(f'{colorama.Fore.YELLOW}new cluster'
+    click.secho(f'{colorama.Fore.YELLOW}new cluster: '
                 f'{colorama.Style.RESET_ALL}{cluster_name}')
 
 
@@ -484,7 +484,6 @@ def _make_task_or_dag_from_entrypoint_with_overrides(
                         fg='yellow',
                         nl=False)
             click.secho(entrypoint, bold=True)
-
     override_params = _parse_override_params(cloud=cloud,
                                              region=region,
                                              zone=zone,

src/pymc_server/utils/yaml.py

@@ -27,7 +27,9 @@ def merge_yaml(user_config_path, pymc_path):
         )
         ```
     """
-    merged_yaml = hiyapyco.load(pymc_path, user_config_path, method=hiyapyco.METHOD_MERGE)
+
+    merged_yaml = hiyapyco.load(pymc_path, user_config_path)
+
     return hiyapyco.dump(merged_yaml)
 
 def getUserYaml(path):