diff --git a/lib/index.ts b/lib/index.ts
index b7080d42..9f10d2e6 100644
--- a/lib/index.ts
+++ b/lib/index.ts
@@ -1,6 +1,3 @@
-<<<<<<< HEAD
-=======
 export * from './interfaces';
->>>>>>> chore(): nestjs notify process
 export * from './nestjs-notify.module';
 export * from './nestjs-notify.service';