diff --git a/notification_generator.ipynb b/notification_generator.ipynb
index 8d24f92..6f8b7a4 100644
--- a/notification_generator.ipynb
+++ b/notification_generator.ipynb
@@ -151,7 +151,7 @@
     }
    ],
    "source": [
-    "error_models = general_events.get('ERROR', {}).get('models', [])\n",
+    "error_models = general_events.get('ERROR', {}).get('', [])\n",
     "warning_models = general_events.get('WARNING', {}).get('models', [])\n",
     "info_models = general_events.get('INFO', {}).get('models', [])\n",
     "mail_type = 'Alerts'\n",
diff --git a/orchestrator/utils/orchestrator_functions.py b/orchestrator/utils/orchestrator_functions.py
index 0e6ad32..ba8867b 100644
--- a/orchestrator/utils/orchestrator_functions.py
+++ b/orchestrator/utils/orchestrator_functions.py
@@ -38,6 +38,7 @@ def common_config(config: dict[str, Any]):
         'model_config': model.get('model_config', {}),
         'execution_timeout_seconds': config.get('execution_timeout_seconds', 300),
         'task_timeout_seconds': config.get('task_timeout_seconds', 300),
+        'on_conflict': config.get('on_conflict', 'error'),
     }