hotfix conflict

src/app/components/index.ts

@@ -6,7 +6,6 @@ import { PaginatorComponent } from './paginator/paginator.component';
 import { ResourceDetailComponent } from './resources/detail/resource-detail.component';
 import { ResourceFormComponent } from './resources/edit/resource-form.component';
 import { ResourcesComponent } from './resources/list/resources.component';
-import { WelcomeComponent } from './welcome/welcome.component';
 import { BackButtonComponent } from './back-button/back-button.component';
 import { CrudButtonsComponent } from './crud-buttons/crud-buttons.component';
 import { FormatsComponent } from './formats/list/formats.component';
@@ -21,6 +20,7 @@ import { LogsSlugsComponent } from './logs-dashboard/logs-slugs/logs-slugs.compo
 import { LogsPreReportComponent } from './logs-dashboard/report/logs-pre-report/logs-pre-report.component';
 import { LogsReportComponent } from './logs-dashboard/report/logs-report/logs-report.component';
 import { LogsHomeComponent } from './logs-dashboard/logs-home/logs-home.component';
+import { PageHeaderComponent } from './page-header/page-header.component';
 
 export {
   MenuComponent,
@@ -31,7 +31,6 @@ export {
   ResourceDetailComponent,
   ResourceFormComponent,
   ResourcesComponent,
-  WelcomeComponent,
   BackButtonComponent,
   CrudButtonsComponent,
   FormatsComponent,
@@ -46,6 +45,7 @@ export {
   LogsPreReportComponent,
   LogsReportComponent,
   LogsHomeComponent,
+  PageHeaderComponent,
 };
 
 // tslint:disable-next-line:variable-name
@@ -58,7 +58,6 @@ export const AppComponents = [
   ResourceDetailComponent,
   ResourceFormComponent,
   ResourcesComponent,
-  WelcomeComponent,
   BackButtonComponent,
   CrudButtonsComponent,
   FormatsComponent,
@@ -73,4 +72,5 @@ export const AppComponents = [
   LogsPreReportComponent,
   LogsReportComponent,
   LogsHomeComponent,
+  PageHeaderComponent,
 ];