fixed issue from merge conflict

src/app.service.ts

 import { Injectable } from '@nestjs/common';
 
 @Injectable()
-export class AppService {}
+export class AppService {
+  getHello(): string {
+    return 'Hello World!';
+  }
+}