Fix config merging

Author: schustmi

src/zenml/config/step_configurations.py

@@ -261,6 +261,8 @@ def apply_pipeline_configuration(
                 "failure_hook_source",
                 "success_hook_source",
                 "substitutions",
+                "environment",
+                "secrets",
             },
             exclude_none=True,
         )
@@ -272,10 +274,16 @@ def apply_pipeline_configuration(
                     "failure_hook_source",
                     "success_hook_source",
                     "substitutions",
+                    "environment",
+                    "secrets",
                 },
                 exclude_none=True,
             )
 
+            original_values["secrets"] = pipeline_values.get(
+                "secrets", []
+            ) + original_values.get("secrets", [])
+
             updated_config = self.model_copy(update=pipeline_values, deep=True)
             return update_model(updated_config, original_values)
         else:

src/zenml/zen_server/template_execution/utils.py

@@ -48,15 +48,11 @@
     validate_stack_is_runnable_from_server,
 )
 from zenml.stack.flavor import Flavor
-<<<<<<< HEAD
 from zenml.utils import (
-    dict_utils,
+    pydantic_utils,
     requirements_utils,
     settings_utils,
 )
-=======
-from zenml.utils import pydantic_utils, requirements_utils, settings_utils
->>>>>>> develop
 from zenml.zen_server.auth import AuthContext, generate_access_token
 from zenml.zen_server.template_execution.runner_entrypoint_configuration import (
     RunnerEntrypointConfiguration,