fix merge conflict

Author: julio-santana

.buildkite/pipelines/periodic.yml

@@ -533,11 +533,7 @@ steps:
             ES_RUNTIME_JAVA:
               - openjdk21
               - openjdk23
-<<<<<<< HEAD
-            BWC_VERSION: ["8.16.7", "8.17.5", "8.18.0", "8.19.0", "9.0.0", "9.1.0"]
-=======
             BWC_VERSION: ["8.17.6", "8.18.0", "8.19.0", "9.0.1", "9.1.0"]
->>>>>>> 7350e363112 (Bump versions after 9.0.0 release)
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004