Fix conflict

Author: ruanwenjun

dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/repository/impl/WorkflowInstanceDaoImpl.java

@@ -33,7 +33,6 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Propagation;
 
 @Slf4j
 @Repository
@@ -78,12 +77,6 @@ public void forceUpdateWorkflowInstanceState(Integer id, WorkflowExecutionStatus
         mybatisMapper.forceUpdateWorkflowInstanceState(id, status);
     }
 
-    @Override
-    @Transactional(propagation = Propagation.REQUIRES_NEW, isolation = Isolation.READ_COMMITTED, rollbackFor = Exception.class)
-    public void performTransactionalUpsert(WorkflowInstance workflowInstance) {
-        this.upsertWorkflowInstance(workflowInstance);
-    }
-
     /**
      * find last scheduler process instance in the date interval
      *