fix conflict

Author: ephraimbuddy

airflow-core/tests/unit/models/test_taskinstance.py

@@ -70,10 +70,6 @@
 from airflow.sdk.definitions.asset import Asset, AssetAlias
 from airflow.sdk.definitions.param import process_params
 from airflow.sdk.definitions.taskgroup import TaskGroup
-from airflow.sdk.exceptions import (
-    AirflowFailException,
-    AirflowSkipException,
-)
 from airflow.sdk.execution_time.comms import (
     AssetEventsResult,
 )