diff --git a/manifest-pipeline-yocto.yml b/manifest-pipeline-yocto.yml
index 46c34f37ccbb7a3b80a2c3c810f9979c2761b26d..c0d96905f407ba209b9a50a864964a525218b814 100644
--- a/manifest-pipeline-yocto.yml
+++ b/manifest-pipeline-yocto.yml
@@ -191,10 +191,7 @@ retrigger:
          if [ ${CI_PIPELINE_SOURCE} == "pipeline" ]; then
             echo "This is the manifest branch used for the build ${CI_COMMIT_REF_NAME}"
             BUILD_BRANCH="${CI_COMMIT_REF_NAME}"
-<<<<<<< HEAD
          fi
-=======
->>>>>>> c0c25b3b80578877a4c95177a8158f4c2adf5245
       - |
         su secous -c "
         repo init -u ${CI_REPOSITORY_URL} -b ${BUILD_BRANCH};