diff --git a/packages/backend-common/api-report.md b/packages/backend-common/api-report.md
index 65f5cc0410..4f97cd77e8 100644
--- a/packages/backend-common/api-report.md
+++ b/packages/backend-common/api-report.md
@@ -35,6 +35,8 @@ import * as winston from 'winston';
 import { Writable } from 'stream';
 
 // Warning: (ae-missing-release-tag) "AwsS3UrlReader" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+<<<<<<< HEAD
+=======
 //
 // @public (undocumented)
 export class AwsS3UrlReader implements UrlReader {
@@ -64,6 +66,39 @@ export class AwsS3UrlReader implements UrlReader {
   toString(): string;
 }
 
+// Warning: (ae-missing-release-tag) "AzureUrlReader" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+>>>>>>> bd119f21cc075b9d09eb0470566eee996364fbb0
+//
+// @public (undocumented)
+export class AwsS3UrlReader implements UrlReader {
+  constructor(
+    integration: AwsS3Integration,
+    deps: {
+      s3: S3;
+      treeResponseFactory: ReadTreeResponseFactory;
+    },
+  );
+  // (undocumented)
+  static factory: ReaderFactory;
+  // (undocumented)
+  read(url: string): Promise<Buffer>;
+  // (undocumented)
+<<<<<<< HEAD
+  readTree(url: string): Promise<ReadTreeResponse>;
+  // Warning: (ae-forgotten-export) The symbol "ReadUrlOptions" needs to be exported by the entry point index.d.ts
+  // Warning: (ae-forgotten-export) The symbol "ReadUrlResponse" needs to be exported by the entry point index.d.ts
+  //
+=======
+  readTree(url: string, options?: ReadTreeOptions): Promise<ReadTreeResponse>;
+>>>>>>> bd119f21cc075b9d09eb0470566eee996364fbb0
+  // (undocumented)
+  readUrl(url: string, options?: ReadUrlOptions): Promise<ReadUrlResponse>;
+  // (undocumented)
+  search(): Promise<SearchResponse>;
+  // (undocumented)
+  toString(): string;
+}
+
 // Warning: (ae-missing-release-tag) "AzureUrlReader" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
diff --git a/plugins/catalog-backend/package.json b/plugins/catalog-backend/package.json
index 07b0b09f0f..79613a9319 100644
--- a/plugins/catalog-backend/package.json
+++ b/plugins/catalog-backend/package.json
@@ -64,22 +64,15 @@
     "yup": "^0.29.3"
   },
   "devDependencies": {
-<<<<<<< HEAD
-<<<<<<< HEAD
     "@backstage/backend-test-utils": "^0.1.6",
     "@backstage/cli": "^0.7.9",
-=======
     "aws-sdk-mock": "^5.2.1",
-<<<<<<< HEAD
     "@backstage/backend-test-utils": "^0.1.5",
     "@backstage/cli": "^0.7.8",
->>>>>>> Finish AwsS3ReadTreeProcessor tests
-=======
-=======
->>>>>>> Copy package.json from master and add 'aws-sdk-mock' to devDependencies
     "@backstage/backend-test-utils": "^0.1.6",
     "@backstage/cli": "^0.7.9",
->>>>>>> Resolve conflict with package.json
+    "@backstage/backend-test-utils": "^0.1.6",
+    "@backstage/cli": "^0.7.9",
     "@backstage/test-utils": "^0.1.17",
     "@types/core-js": "^2.5.4",
     "@types/git-url-parse": "^9.0.0",