message: catalog-backend: fix merge conflict
diff: @@ -124,7 +124,7 @@ describe('DefaultLocationServiceTest', () => {
  };
  orchestrator.process.mockResolvedValueOnce({
  ok: true,
  - state: new Map(),
  + state: {},
  completedEntity: {
  apiVersion: 'backstage.io/v1alpha1',
  kind: 'Component',
  @@ -151,7 +151,7 @@ describe('DefaultLocationServiceTest', () => {
  it('should return exists false when the location does not exist beforehand', async () => {
  orchestrator.process.mockResolvedValueOnce({
  ok: true,
  - state: new Map(),
  + state: {},
  completedEntity: {
  apiVersion: 'backstage.io/v1alpha1',
  kind: 'Component',
  