diff --git a/app.js b/app.js
index d504b5f84ae22dd04a2a08ab665c6b0163ec7d1b..7d6603c355ec1518ed34c45a3ab908ac2b41bfc6 100644
--- a/app.js
+++ b/app.js
@@ -16,19 +16,10 @@ const app = express();
 
 
 app.use(morgan('dev'));  //濡쒓퉭��
-// CORS �ㅼ젙
-<<<<<<< HEAD
-app.use(
-  cors({
-    origin: process.env.FRONTEND_URL, 
-=======
-
-
 // CORS �ㅼ젙
 app.use(
   cors({
     origin: 'https://yanawa.shop',
->>>>>>> 64c26d78b38c309501ec96a24f94617332a4adb4
     methods: ['GET', 'POST', 'PUT', 'DELETE', 'OPTIONS'],
     allowedHeaders: ['Content-Type', 'Authorization'],
     credentials: true,
@@ -103,4 +94,4 @@ const PORT = process.env.PORT || 3000;
     console.error('�� �쒕쾭 �쒖옉 以� �ㅻ쪟 諛쒖깮:', error);
     process.exit(1);
   }
-})();
\ No newline at end of file
+})();
diff --git a/output.log b/output.log
index 859d37e565baa26a03bda9b9b146163865aac083..b18562fbb6d86fbe6e1a53f0f175f5b22c49111f 100644
--- a/output.log
+++ b/output.log
@@ -1,9 +1,15 @@
-MongoDB URI: mongodb+srv://admin:lim1234!!@goodmeeting.vkniz.mongodb.net/
-(node:17474) [MONGODB DRIVER] Warning: useNewUrlParser is a deprecated option: useNewUrlParser has no effect since Node.js Driver version 4.0.0 and will be removed in the next major version
-(Use `node --trace-warnings ...` to show where the warning was created)
-(node:17474) [MONGODB DRIVER] Warning: useUnifiedTopology is a deprecated option: useUnifiedTopology has no effect since Node.js Driver version 4.0.0 and will be removed in the next major version
-�� MongoDB �곌껐 �깃났
-Rdb�곗씠�곕쿋�댁뒪 �곌껐 �깃났.
-紐⑤뱺 紐⑤뜽�� �깃났�곸쑝濡� �숆린�붾릺�덉뒿�덈떎.
-Server is running on 8080
-GET /api/ 404 6.385 ms - 143
+/home/ubuntu/webback/app.js:20
+<<<<<<< HEAD
+^^
+
+SyntaxError: Unexpected token '<<'
+    at internalCompileFunction (node:internal/vm:76:18)
+    at wrapSafe (node:internal/modules/cjs/loader:1283:20)
+    at Module._compile (node:internal/modules/cjs/loader:1328:27)
+    at Module._extensions..js (node:internal/modules/cjs/loader:1422:10)
+    at Module.load (node:internal/modules/cjs/loader:1203:32)
+    at Module._load (node:internal/modules/cjs/loader:1019:12)
+    at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:128:12)
+    at node:internal/main/run_main_module:28:49
+
+Node.js v18.20.5
diff --git a/weblog.log b/weblog.log
index b8fb89dce61a53b6ca067d18677726b612c22ac1..c52b53566c9147a3bba63d9f9b128fa115d89220 100644
--- a/weblog.log
+++ b/weblog.log
@@ -1,6 +1,6 @@
-(node:17475) [MONGODB DRIVER] Warning: useNewUrlParser is a deprecated option: useNewUrlParser has no effect since Node.js Driver version 4.0.0 and will be removed in the next major version
+(node:23273) [MONGODB DRIVER] Warning: useNewUrlParser is a deprecated option: useNewUrlParser has no effect since Node.js Driver version 4.0.0 and will be removed in the next major version
 (Use `node --trace-warnings ...` to show where the warning was created)
-(node:17475) [MONGODB DRIVER] Warning: useUnifiedTopology is a deprecated option: useUnifiedTopology has no effect since Node.js Driver version 4.0.0 and will be removed in the next major version
+(node:23273) [MONGODB DRIVER] Warning: useUnifiedTopology is a deprecated option: useUnifiedTopology has no effect since Node.js Driver version 4.0.0 and will be removed in the next major version
 MongoDB �곌껐 �ㅽ뙣: MongooseServerSelectionError: connect ECONNREFUSED 127.0.0.1:27017
     at _handleConnectionErrors (/home/ubuntu/webback/node_modules/mongoose/lib/connection.js:909:11)
     at NativeConnection.openUri (/home/ubuntu/webback/node_modules/mongoose/lib/connection.js:860:11)