Apply suggestion from @v1v

Author: v1v

.buildkite/pipeline.yml

@@ -353,7 +353,6 @@ steps:
   # this should help detecting issues earlier in the development cycle
   - label: "Trigger Serverless Beats Tests"
     if: build.pull_request.id != null
-<<<<<<< HEAD
     plugins:
       - monorepo-diff#v1.2.0:
           diff: "git diff --name-only origin/${GITHUB_PR_TARGET_BRANCH}...HEAD"