syedubaid11
diff --git a/‎backend/package-lock.json
+264-264 b/‎backend/package-lock.json
+264-264
diff --git a/‎backend/package.json
+2-2 b/‎backend/package.json
+2-2
diff --git a/‎backend/src/app.module.ts
+4-2 b/‎backend/src/app.module.ts
+4-2
diff --git a/‎backend/src/files/files.controller.spec.ts
-18 b/‎backend/src/files/files.controller.spec.ts
-18
diff --git a/‎backend/src/files/files.controller.ts
-25 b/‎backend/src/files/files.controller.ts
-25
diff --git a/‎backend/src/files/files.module.ts
-26 b/‎backend/src/files/files.module.ts
-26
diff --git a/‎backend/src/files/files.service.spec.ts
-18 b/‎backend/src/files/files.service.spec.ts
-18
diff --git a/‎backend/src/files/files.service.ts
-9 b/‎backend/src/files/files.service.ts
-9
@@ -20,8 +20,8 @@
     "test:e2e": "jest --config ./test/jest-e2e.json"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.772.0",
-    "@aws-sdk/s3-request-presigner": "^3.772.0",
+    "@aws-sdk/client-s3": "^3.774.0",
+    "@aws-sdk/s3-request-presigner": "^3.774.0",
     "@neondatabase/serverless": "^0.10.4",
     "@nestjs/cache-manager": "^3.0.0",
     "@nestjs/common": "^11.0.1",
 
@@ -1,16 +1,18 @@
 import { Module } from '@nestjs/common';
 import { AppController } from './app.controller';
 import { AppService } from './app.service';
-import { FilesModule } from './files/files.module';
 import { UsersModule } from './users/users.module';
-import { AdminModule } from './admin/admin.module';
 import { DrizzleModule } from './drizzle.module';
 import { DatabaseModule } from './database.module';
 // import { RedisService } from './redis.service';
 import { FriendsModule } from './friends/friends.module';
 
 @Module({
+<<<<<<< HEAD
   imports: [FilesModule, UsersModule, AdminModule , DrizzleModule , DatabaseModule, FriendsModule],
+=======
+  imports: [UsersModule,DrizzleModule , DatabaseModule, FriendsModule, UploadModule],
+>>>>>>> 6f86d19580e43e782c34009322de0cfdb1f2ad81
   controllers: [AppController],
   providers: [AppService],//[RedisService]
 })