diff --git a/apps/server/src/models/goods/goods.module.ts b/apps/server/src/models/goods/goods.module.ts
index 3439841..7605654 100644
--- a/apps/server/src/models/goods/goods.module.ts
+++ b/apps/server/src/models/goods/goods.module.ts
@@ -3,18 +3,8 @@ import { GoodsService } from './goods.service';
 import { GoodsController } from './goods.controller';
 
 @Module({
-<<<<<<< HEAD
-
     providers: [GoodsService],
     controllers:[GoodsController]
-
-
 })
 
 export class GoodsModule {}
-=======
-  providers: [GoodsService],
-  controllers: [GoodsController],
-})
-export class GoodsModule {}
->>>>>>> de6e632ec69dd408a6c4e85d5cda01a1aa8e8276