resolve merge conflict

Author: zhiyuanliang-ms

package-lock.json

@@ -69,7 +69,8 @@
     "vitest": "^4.1.8"
   },
   "dependencies": {
-    "@azure/app-configuration": "^1.11.0",
+    "@azure/app-configuration": "^1.12.1",
+    "@azure-rest/core-client": "^2.6.0",
     "@azure/core-rest-pipeline": "^1.6.0",
     "@azure/identity": "^4.2.1",
     "@azure/keyvault-secrets": "^4.7.0",

package.json

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import { OperationOptions } from "@azure/core-client";
+import { OperationOptions } from "@azure-rest/core-client";
 import {
     AppConfigurationClient,
     ConfigurationSettingId,
@@ -114,8 +114,8 @@ function applyRequestTracing<T extends OperationOptions>(requestTracingOptions:
     if (requestTracingOptions.enabled) {
         actualOptions.requestOptions = {
             ...actualOptions.requestOptions,
-            customHeaders: {
-                ...actualOptions.requestOptions?.customHeaders,
+            headers: {
+                ...actualOptions.requestOptions?.headers,
                 [CORRELATION_CONTEXT_HEADER_NAME]: createCorrelationContextHeader(requestTracingOptions)
             }
         };