diff --git a/dolphinscheduler-ui/src/store/project/types.ts b/dolphinscheduler-ui/src/store/project/types.ts
index 71073c8e89..8c2dae5162 100644
--- a/dolphinscheduler-ui/src/store/project/types.ts
+++ b/dolphinscheduler-ui/src/store/project/types.ts
@@ -18,9 +18,6 @@
 import type { EditWorkflowDefinition } from '@/views/projects/workflow/components/dag/types'
 import type { IOption } from '@/components/form/types'
 
-<<<<<<< HEAD
-type ProgramType = 'JAVA' | 'SCALA' | 'PYTHON' | 'SQL'
-=======
 type TaskExecuteType = 'STREAM' | 'BATCH'
 
 type TaskType =
@@ -62,7 +59,6 @@ type TaskType =
 
 type ProgramType = 'JAVA' | 'SCALA' | 'PYTHON'
 
->>>>>>> 4e09bacb1 ([Fix-13248][UI] Ironed out the issue with failing to query task instances by some state of task. (#13251))
 type DependentResultType = {
   [key: string]: 'SUCCESS' | 'FAILURE'
 }