Fix build file

Signed-off-by: Stephen Crawford <[email protected]>

build.gradle

@@ -213,7 +213,6 @@ dependencies {
     testImplementation "org.apache.kafka:kafka-clients:${kafka_version}:test"
     compileOnly "org.opensearch:opensearch:${opensearch_version}"
 
-<<<<<<< HEAD
     integrationTestCompileOnly "org.opensearch:opensearch:${opensearch_version}"
     integrationTestImplementation "org.opensearch.plugin:reindex-client:${opensearch_version}"
     integrationTestImplementation "org.opensearch:opensearch-ssl-config:${opensearch_version}"
@@ -256,16 +255,6 @@ dependencies {
     integrationTestImplementation "org.apache.httpcomponents:fluent-hc:4.5.13"
     integrationTestImplementation "org.apache.httpcomponents:httpcore:4.4.16"
     integrationTestImplementation "org.apache.httpcomponents:httpasyncclient:4.1.5"
-=======
-
-
-configurations.runtimeClasspath {
-    // jackson-* is already included in OpenSearch
-    exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core'
-    exclude group: 'com.fasterxml.jackson.dataformat', module: 'jackson-dataformat-cbor'
-    exclude group: 'com.fasterxml.jackson.dataformat', module: 'jackson-dataformat-smile'
-    exclude group: 'com.fasterxml.jackson.dataformat', module: 'jackson-dataformat-yaml'
->>>>>>> 131bb8da (Force logback)
 }
 
 group = 'org.opensearch'