diff --git a/ng6-seed/src/app/settings/service/entity/entity.service.ts b/ng6-seed/src/app/settings/service/entity/entity.service.ts
index 3adb41f8b..8fb6020ae 100755
--- a/ng6-seed/src/app/settings/service/entity/entity.service.ts
+++ b/ng6-seed/src/app/settings/service/entity/entity.service.ts
@@ -12,13 +12,9 @@ import { environment } from 'environments/environment';
 /** Imported Service Files Are., */
 import { AwsService } from '../../../AwsService/aws.service';
 
-/** Environment */
-import { environment } from  '../../../../environments/environment';
-
 /** Consant Value For Created Date And Updated Date  */
 const currentdate = new Date().toJSON().slice(0, 19).replace('T', ' ');
 
-
 @Injectable({
   providedIn: 'root'
 })
@@ -28,10 +24,7 @@ const currentdate = new Date().toJSON().slice(0, 19).replace('T', ' ');
 * Kdk
 */
 export class EntityService {
-<<<<<<< HEAD
-  
-=======
->>>>>>> e945a07cbf0d2c99e43afcb965007c5dde7684fe
+
   private apiUrl = environment.apiEndpoint;
   private serviceUrl = 'https://jsonplaceholder.typicode.com/users';