Update build.gradle

Revert build.gradle

build.gradle

@@ -336,25 +336,12 @@ String bwcVersion = bwcBundleTest ? bwcBundleVersion : bwcMinVersion
 String bwcCurrentVersion = opensearch_version.replace("-SNAPSHOT", "")
 String baseName = "obsBwcCluster"
 String bwcFilePath = "src/test/resources/bwc/"
-<<<<<<< HEAD
 String remoteFileURL = "https://github.com/opensearch-project/observability/releases/download/1.2.0.0/opensearch-observability-1.2.0.0.zip"
-=======
-String bwcObservabilityPlugin = "opensearch-observability-" + bwcVersion + ".zip"
-// TODO: remove bwc job scheduler after 2.9 release
-String bwcJobSchedulerPlugin = "opensearch-job-scheduler-" + bwcVersion + ".zip"
-String remoteFileURL = "https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-observability&v=$bwcVersion-SNAPSHOT&p=zip"
-String bwcJobSchedulerURL = "https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-job-scheduler&v=$bwcVersion-SNAPSHOT&p=zip"
-String bwcSnapshotVersion = baseVersion + "-SNAPSHOT"
->>>>>>> 033779cf (Fix from upstream core.action changes (#1590))
 
 2.times {i ->
     testClusters {
         "${baseName}$i" {
             testDistribution = "ARCHIVE"
-<<<<<<< HEAD
-=======
-            versions = [bwcSnapshotVersion,opensearch_version]
->>>>>>> 033779cf (Fix from upstream core.action changes (#1590))
             numberOfNodes = 3
             if (bwcBundleTest) {
                 versions = ["1.3.2", bwcCurrentVersion]