From dddf8df2b2fbb068c954571dfeb25a00406d21b2 Mon Sep 17 00:00:00 2001
From: jonas-atmire <jonas@atmire.com>
Date: Fri, 25 Sep 2020 11:38:11 +0200
Subject: [PATCH] Merge conflict fixes

---
 .../edit-bitstream-page/edit-bitstream-page.component.ts      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/+bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts b/src/app/+bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
index 6f0a60c554..7f002478fe 100644
--- a/src/app/+bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
+++ b/src/app/+bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
@@ -16,6 +16,7 @@ import {
 import { FormGroup } from '@angular/forms';
 import { TranslateService } from '@ngx-translate/core';
 import { DynamicCustomSwitchModel } from '../../shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.model';
+import { cloneDeep } from 'lodash';
 import { BitstreamDataService } from '../../core/data/bitstream-data.service';
 import {
   getAllSucceededRemoteDataPayload,
@@ -34,8 +35,7 @@ import { Location } from '@angular/common';
 import { Observable } from 'rxjs/internal/Observable';
 import { RemoteData } from '../../core/data/remote-data';
 import { PaginatedList } from '../../core/data/paginated-list';
-import {getItemEditPath, getItemPageRoute} from '../../+item-page/item-page-routing.module';
-import { getItemEditRoute } from '../../+item-page/item-page-routing-paths';
+import { getItemEditRoute, getItemPageRoute } from '../../+item-page/item-page-routing-paths';
 import {Bundle} from '../../core/shared/bundle.model';
 import {Item} from '../../core/shared/item.model';