update

src/app/BasicPage/footer.component.ts

@@ -5,11 +5,7 @@
 import {Component} from '@angular/core';
 import {Logger} from 'angular2-logger/core';
 
-<<<<<<< HEAD:src/app/footer.component.ts
-import {AppService, DataStore, User} from './app.service';
-=======
-import {AppService, DataStore} from '../app.service';
->>>>>>> master:src/app/BasicPage/footer.component.ts
+import {AppService, DataStore, User} from '../app.service';
 
 
 @Component({

src/app/login.component.ts → src/app/BasicPage/login.component.ts

@@ -4,7 +4,7 @@
 
 import {Component, OnInit} from '@angular/core';
 import {Logger} from 'angular2-logger/core';
-import {AppService, DataStore, User} from './app.service';
+import {AppService, DataStore, User} from '../app.service';
 import {NgForm} from '@angular/forms';
 
 declare let jQuery: any;

src/app/BasicPage/nav.component.ts

@@ -3,21 +3,13 @@
  */
 
 import {Component} from '@angular/core';
-import {NgClass} from '@angular/common';
-// import {ROUTER_DIRECTIVES} from '@angular/router-deprecated';
 import {Logger} from 'angular2-logger/core';
 
-// import  'rxjs/Rx';
-// declare var jQuery: any;
 // declare var Clipboard: any;
 // declare var layer: any;
 
 
-<<<<<<< HEAD:src/app/nav.component.ts
-import {AppService, DataStore, User} from './app.service';
-=======
-import {AppService, DataStore} from '../app.service';
->>>>>>> master:src/app/BasicPage/nav.component.ts
+import {AppService, DataStore, User} from '../app.service';
 
 
 //noinspection TypeScriptValidateTypes

src/app/IndexPage/welcome.component.ts

 /**
  * Created by liuzheng on 2017/8/31.
  */
-<<<<<<< HEAD:src/app/welcome.component.ts
-import {Component, OnInit} from '@angular/core';
-import {AppService, DataStore, User} from './app.service';
-=======
+
 import {Component} from '@angular/core';
-import {AppService} from '../app.service';
->>>>>>> master:src/app/IndexPage/welcome.component.ts
+import {AppService, User} from '../app.service';
 
 @Component({
   templateUrl: './welcome.html',

src/app/app-routing.module.ts

@@ -4,14 +4,12 @@
 import {NgModule} from '@angular/core';
 import {RouterModule, Routes} from '@angular/router';
 import {environment} from '../environments/environment';
-<<<<<<< HEAD
-import {LoginComponent} from './login.component';
-=======
 
 import {WelcomeComponent} from './IndexPage/welcome.component';
+
 import {PageNotFoundComponent} from './BasicPage/not-found.component';
+import {LoginComponent} from './BasicPage/login.component';
 
->>>>>>> master
 const appRoutes: Routes = [
   // { path: 'crisis-center', component: CrisisListComponent },
   {path: 'welcome', component: WelcomeComponent}, // <-- delete this line

src/app/app.module.ts

@@ -12,23 +12,14 @@ import {AppRoutingModule} from './app-routing.module';
 
 
 import {AppComponent} from './app.component';
-<<<<<<< HEAD
-import {WelcomeComponent} from './welcome.component';
-import {NavComponent} from './nav.component';
-import {FooterComponent} from './footer.component';
-import {LeftbarComponent} from './leftbar.component';
-import {PageNotFoundComponent} from './not-found.component';
-import {LoginComponent} from './login.component';
-
-=======
 
 import {NavComponent} from './BasicPage/nav.component';
 import {PageNotFoundComponent} from './BasicPage/not-found.component';
 import {FooterComponent} from './BasicPage/footer.component';
+import {LoginComponent} from './BasicPage/login.component';
 
 import {WelcomeComponent} from './IndexPage/welcome.component';
 import {LeftbarComponent} from './IndexPage/leftbar.component';
->>>>>>> master
 
 @NgModule({
   imports: [