diff --git a/packages/opentelemetry-resource-detector-aws/src/detectors/AwsEksDetector.ts b/packages/opentelemetry-resource-detector-aws/src/detectors/AwsEksDetector.ts
index 6f2f923e8f..febcd8b525 100644
--- a/packages/opentelemetry-resource-detector-aws/src/detectors/AwsEksDetector.ts
+++ b/packages/opentelemetry-resource-detector-aws/src/detectors/AwsEksDetector.ts
@@ -325,6 +325,9 @@ export class AwsEksDetector implements Detector {
    * the identity properties in a local map.
    */
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> eda056317... fix: add parsing to Cluster JSON response
   private async _fetchString(options: https.RequestOptions): Promise<string> {
     return await new Promise((resolve, reject) => {
 =======