resolve conflicts

src/conductor/client/http/models/workflow_task.py

@@ -1,6 +1,6 @@
 import pprint
 import re  # noqa: F401
-from typing import List
+from typing import List, Dict
 
 import six
 
@@ -124,7 +124,7 @@ def __init__(self, name=None, task_reference_name=None, description=None, input_
                  sub_workflow_param=None, join_on=None, sink=None, optional=None, task_definition=None,
                  rate_limited=None, default_exclusive_join_task=None, async_complete=None, loop_condition=None,
                  loop_over=None, retry_count=None, evaluator_type=None, expression=None,
-                 workflow_task_type=None, on_state_change: dict[str, StateChangeConfig] = None,
+                 workflow_task_type=None, on_state_change: Dict[str, StateChangeConfig] = None,
                  cache_config: CacheConfig = None):  # noqa: E501
         """WorkflowTask - a model defined in Swagger"""  # noqa: E501
         self._name = None
@@ -850,7 +850,7 @@ def workflow_task_type(self, workflow_task_type):
         self._workflow_task_type = workflow_task_type
 
     @property
-    def on_state_change(self) -> dict[str, List[StateChangeEvent]]:
+    def on_state_change(self) -> Dict[str, List[StateChangeEvent]]:
         return self._on_state_change
 
     @on_state_change.setter