diff --git a/apps/server/src/models/goods/goods.service.ts b/apps/server/src/models/goods/goods.service.ts
index cbb7b29..f5e6cc7 100644
--- a/apps/server/src/models/goods/goods.service.ts
+++ b/apps/server/src/models/goods/goods.service.ts
@@ -1,10 +1,6 @@
 import { Injectable } from '@nestjs/common';
 
 @Injectable()
-<<<<<<< HEAD
-export class GoodsService {}
-=======
 export class GoodsService {
     
 }
->>>>>>> 28132992c8dc4afaf9311d9ecd4ecd992e43e827