Git pull with conflits

src/app/app.module.ts

@@ -12,18 +12,15 @@ import { HttpClientModule } from '@angular/common/http';
 
 import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
 
-
 //import { File } from '@ionic-native/File/ngx';
 import { WebView } from '@ionic-native/ionic-webview/ngx';
 import { FilePath } from '@ionic-native/file-path/ngx';
 import { Camera } from '@ionic-native/camera/ngx';
 import { IonicStorageModule } from '@ionic/storage';
-//
 
 import { CommonModule } from '@angular/common';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 
-
 import { CalendarModule, DateAdapter } from 'angular-calendar';
 import { adapterFactory } from 'angular-calendar/date-adapters/date-fns';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
@@ -35,7 +32,6 @@ import {MatDatepickerModule} from '@angular/material/datepicker';
 import {MAT_DATE_FORMATS, MAT_DATE_LOCALE} from '@angular/material/core';
 import { NgxMatDateFormats, NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker';
 import { Network } from '@ionic-native/network/ngx';
-import { File } from 'node_modules_/@ionic-native/file/ngx';
 import { MultipleDocumentsPicker } from '@awesome-cordova-plugins/multiple-document-picker/ngx';
 
 
@@ -57,13 +53,14 @@ import { far } from '@fortawesome/free-regular-svg-icons'
 import { fab } from '@fortawesome/free-brands-svg-icons'
 
 import { ScreenOrientation } from '@ionic-native/screen-orientation/ngx';
-import { PdfViewerModule } from 'ng2-pdf-viewer';
 import { SQLite } from '@ionic-native/sqlite/ngx';
 import { CookieService } from 'ngx-cookie-service';
 
 import { ImagePicker } from '@ionic-native/image-picker/ngx';
 import { MediaCapture } from '@ionic-native/media-capture/ngx';
 import { Media } from '@ionic-native/media/ngx';
+import { File } from '@ionic-native/file/ngx';
+
 import { StreamingMedia } from '@ionic-native/streaming-media/ngx';
 import { PhotoViewer } from '@ionic-native/photo-viewer/ngx';
 import {NgxImageCompressService} from 'ngx-image-compress';
@@ -112,10 +109,8 @@ import { FirebaseX } from '@ionic-native/firebase-x/ngx'; */
     MatSelectModule,
     MatDialogModule,
     //
-    PdfViewerModule,
     HammerModule,
-    CustomImageCachePageRoutingModule
-
+    CustomImageCachePageRoutingModule,
 
     ],
   providers: [
@@ -127,7 +122,7 @@ import { FirebaseX } from '@ionic-native/firebase-x/ngx'; */
     { provide: RouteReuseStrategy, useClass: IonicRouteStrategy },
     InAppBrowser,
     Camera,
-    //File,
+    File,
     WebView,
     FilePath,
    /*  FCM,
@@ -136,7 +131,6 @@ import { FirebaseX } from '@ionic-native/firebase-x/ngx'; */
     ChatService,
     ScreenOrientation,
     Network,
-    File,
     SQLite,
     CookieService,
     ImagePicker,