diff --git a/.github/workflows/kubeflow-pipelines-manifests.yml b/.github/workflows/kubeflow-pipelines-manifests.yml
index 7975ab73143..4ae7f08f11c 100644
--- a/.github/workflows/kubeflow-pipelines-manifests.yml
+++ b/.github/workflows/kubeflow-pipelines-manifests.yml
@@ -9,12 +9,8 @@ on:
       - 'manifests/kustomize/**'     
 
 jobs:
-  kubeflow-pipelines-manifests:
-<<<<<<< HEAD
-    runs-on: ubuntu-latest
-=======
+  kubeflow-pipelines-manifests:    
     runs-on: ubuntu-latest    
->>>>>>> 6f0be5530 (Updated github workflow and presubmit script)
     steps:
       - name: Checkout code
         uses: actions/checkout@v4