resolved conflicts

Author: prasankh

ads/opctl/operator/lowcode/forecast/model/factory.py

@@ -13,6 +13,7 @@
 from .neuralprophet import NeuralProphetOperatorModel
 from .prophet import ProphetOperatorModel
 from .forecast_datasets import ForecastDatasets
+from .ml_forecast import MLForecastOperatorModel
 
 class UnSupportedModelError(Exception):
     def __init__(self, model_type: str):

tests/operators/forecast/test_errors.py

@@ -226,7 +226,7 @@ def populate_yaml(
 
 def run_operator(
     tmpdirname=None,
-    model="auto",
+    model="auto-select",
     historical_data_path=None,
     additional_data_path=None,
     test_data_path=None,