solved merge issues

src/app/+search-page/search-page.component.ts

@@ -1,6 +1,5 @@
 import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { Observable } from 'rxjs/Observable';
 import { SortOptions } from '../core/cache/models/sort-options.model';
 import { CommunityDataService } from '../core/data/community-data.service';
 import { RemoteData } from '../core/data/remote-data';

src/app/shared/shared.module.ts

@@ -67,9 +67,6 @@ const COMPONENTS = [
   ViewModeSwitchComponent
 ];
 
-const DIRECTIVES = [
-];
-
 const ENTRY_COMPONENTS = [
   // put shared entry components (components that are created dynamically) here
   CollectionListElementComponent,