Fix merge conflict

Author: jescriba

Package.swift

@@ -169,7 +169,6 @@ extension Package {
       )
       products.append(contentsOf: [
         .library(name: "JaegerExporter", targets: ["JaegerExporter"]),
->>>>>>> main
         .executable(name: "simpleExporter", targets: ["SimpleExporter"]),
         .library(name: "NetworkStatus", targets: ["NetworkStatus"]),
         .library(name: "URLSessionInstrumentation", targets: ["URLSessionInstrumentation"]),
@@ -208,89 +207,6 @@ extension Package {
                 dependencies: ["OpenTelemetrySdk", "NetworkStatus"],
                 path: "Sources/Instrumentation/URLSession",
                 exclude: ["README.md"]),
-<<<<<<< HEAD
-        .target(name: "NetworkStatus",
-                dependencies: [
-                    "OpenTelemetryApi",
-                    .product(name: "Reachability", package: "Reachability.swift")
-                ],
-                path: "Sources/Instrumentation/NetworkStatus",
-                linkerSettings: [.linkedFramework("CoreTelephony", .when(platforms: [.iOS]))]),
-        .target(name: "SignPostIntegration",
-                dependencies: ["OpenTelemetrySdk"],
-                path: "Sources/Instrumentation/SignPostIntegration",
-                exclude: ["README.md"]),
-        .target(name: "OpenTracingShim",
-                dependencies: ["OpenTelemetrySdk",
-                               "Opentracing"],
-                path: "Sources/Importers/OpenTracingShim",
-                exclude: ["README.md"]),
-        .target(name: "SwiftMetricsShim",
-                dependencies: ["OpenTelemetrySdk",
-                               .product(name: "CoreMetrics", package: "swift-metrics")],
-                path: "Sources/Importers/SwiftMetricsShim",
-                exclude: ["README.md"]),
-        .target(name: "JaegerExporter",
-                dependencies: ["OpenTelemetrySdk",
-                               .product(name: "Thrift", package: "Thrift")],
-                path: "Sources/Exporters/Jaeger"),
-        .target(name: "ZipkinExporter",
-                dependencies: ["OpenTelemetrySdk"],
-                path: "Sources/Exporters/Zipkin"),
-        .target(name: "PrometheusExporter",
-                dependencies: ["OpenTelemetrySdk",
-                               .product(name: "NIO", package: "swift-nio"),
-                               .product(name: "NIOHTTP1", package: "swift-nio")],
-                path: "Sources/Exporters/Prometheus"),
-        .target(name: "OpenTelemetryProtocolExporterCommon",
-                dependencies: ["OpenTelemetrySdk",
-                               .product(name: "Logging", package: "swift-log"),
-                               .product(name: "SwiftProtobuf", package: "swift-protobuf")],
-                path: "Sources/Exporters/OpenTelemetryProtocolCommon"),
-        .target(name: "OpenTelemetryProtocolExporterHttp",
-                dependencies: ["OpenTelemetrySdk",
-                               "OpenTelemetryProtocolExporterCommon",
-                               "OTelDataCompression"],
-                path: "Sources/Exporters/OpenTelemetryProtocolHttp"),
-        .target(name: "OpenTelemetryProtocolExporterGrpc",
-                dependencies: ["OpenTelemetrySdk",
-                               "OpenTelemetryProtocolExporterCommon",
-                               .product(name: "GRPC", package: "grpc-swift")],
-                path: "Sources/Exporters/OpenTelemetryProtocolGrpc"),
-        .target(name: "OTelDataCompression",
-                dependencies: [],
-                path: "Sources/Exporters/DataCompression"),
-        .target(name: "StdoutExporter",
-                dependencies: ["OpenTelemetrySdk"],
-                path: "Sources/Exporters/Stdout"),
-        .target(name: "InMemoryExporter",
-                dependencies: ["OpenTelemetrySdk"],
-                path: "Sources/Exporters/InMemory"),
-        .target(name: "DatadogExporter",
-                dependencies: ["OpenTelemetrySdk",
-                               "OTelDataCompression"],
-                path: "Sources/Exporters/DatadogExporter",
-                exclude: ["NOTICE", "README.md"]),
-        .target(name: "PersistenceExporter",
-                dependencies: ["OpenTelemetrySdk"],
-                path: "Sources/Exporters/Persistence"),
-        .testTarget(name: "OTelSwiftLogTests",
-                    dependencies: ["OTelSwiftLog"],
-                    path: "Tests/BridgesTests/OTelSwiftLog"),
-        .testTarget(name: "NetworkStatusTests",
-                    dependencies: ["NetworkStatus", .product(name: "Reachability", package: "Reachability.swift")],
-                    path: "Tests/InstrumentationTests/NetworkStatusTests"),
-        .testTarget(name: "OpenTelemetryApiTests",
-                    dependencies: ["OpenTelemetryApi", "OpenTelemetryTestUtils"],
-                    path: "Tests/OpenTelemetryApiTests"),
-        .testTarget(name: "OpenTelemetrySdkTests",
-                    dependencies: ["OpenTelemetrySdk"],
-                    path: "Tests/OpenTelemetrySdkTests"),
-        .testTarget(name: "ResourceExtensionTests",
-                    dependencies: ["ResourceExtension", "OpenTelemetrySdk"],
-                    path: "Tests/InstrumentationTests/SDKResourceExtensionTests"),
-=======
->>>>>>> main
         .testTarget(name: "URLSessionInstrumentationTests",
                     dependencies: ["URLSessionInstrumentation",
                                    .product(name: "NIO", package: "swift-nio"),
@@ -346,4 +262,4 @@ if ProcessInfo.processInfo.environment["OTEL_ENABLE_SWIFTLINT"] != nil {
       .plugin(name: "SwiftLintBuildToolPlugin", package: "SwiftLintPlugins")
     ]
   }
-}
+}