Error and conflits after pull solved

src/app/pages/chat/messages/messages.module.ts

@@ -12,7 +12,6 @@ import { BtnModalDismissPage } from 'src/app/shared/btn-modal-dismiss/btn-modal-
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
 import { MatMenuModule } from '@angular/material/menu';
 import { LettersAvatarModule } from "ngx-letters-avatar";
-import { PdfViewerModule } from 'ng2-pdf-viewer';
 
 @NgModule({
   imports: [
@@ -23,7 +22,6 @@ import { PdfViewerModule } from 'ng2-pdf-viewer';
     MessagesPageRoutingModule,
     MatMenuModule,
     LettersAvatarModule,
-    PdfViewerModule
   ],
   declarations: [MessagesPage]
 })