diff --git a/apps/server/src/models/goods/goods.controller.ts b/apps/server/src/models/goods/goods.controller.ts
index 2a4dbf0..322add4 100644
--- a/apps/server/src/models/goods/goods.controller.ts
+++ b/apps/server/src/models/goods/goods.controller.ts
@@ -37,8 +37,4 @@ export class GoodsController {
             results: []
         };
     }
-<<<<<<< HEAD
 }
-=======
-}
->>>>>>> de6e632ec69dd408a6c4e85d5cda01a1aa8e8276
diff --git a/apps/server/src/models/goods/goods.service.ts b/apps/server/src/models/goods/goods.service.ts
index 7288689..2e905b3 100644
--- a/apps/server/src/models/goods/goods.service.ts
+++ b/apps/server/src/models/goods/goods.service.ts
@@ -1,26 +1,5 @@
 import { Injectable } from '@nestjs/common';
 
 @Injectable()
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 export class GoodsService {}
-=======
-<<<<<<< HEAD
-=======
->>>>>>> dc75314e36f86056790758574c3426f379c16a87
-export class GoodsService {}
-=======
-export class GoodsService {
-    
-}
-<<<<<<< HEAD
->>>>>>> 28132992c8dc4afaf9311d9ecd4ecd992e43e827
->>>>>>> 5a581fdda6e53f086e068357e1ce0cb6994ddbf2
-=======
-export class GoodsService {
-    
-}
-=======
->>>>>>> dc75314e36f86056790758574c3426f379c16a87
->>>>>>> de6e632ec69dd408a6c4e85d5cda01a1aa8e8276
+
diff --git a/apps/server/src/trpc/trpc.module.ts b/apps/server/src/trpc/trpc.module.ts
index b07978d..ead8b11 100755
--- a/apps/server/src/trpc/trpc.module.ts
+++ b/apps/server/src/trpc/trpc.module.ts
@@ -34,11 +34,7 @@ import { GoodsModule } from '@server/models/goods/goods.module';
     VisitModule,
     WebSocketModule,
     ResourceModule,
-<<<<<<< HEAD
-    GoodsModule,
-=======
     GoodsModule
->>>>>>> de6e632ec69dd408a6c4e85d5cda01a1aa8e8276
   ],
   controllers: [],
   providers: [TrpcService, TrpcRouter, Logger],