fix: conflict 버그 수정

.yarnrc.yml

@@ -2,14 +2,13 @@ nodeLinker: pnp
 
 npmScopes:
   hoeeeeeh:
-    npmRegistryServer: "https://npm.pkg.github.com/"
+    npmRegistryServer: 'https://npm.pkg.github.com/'
 
 plugins:
   - ./.yarn/plugin-env-npm.js
 
 yarnPath: .yarn/releases/yarn-4.5.1.cjs
 
-
 packageExtensions:
   '@typescript-eslint/utils@*':
     peerDependencies:

yarn.lock

@@ -97,9 +97,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/client-s3@npm:^3.688.0":
-  version: 3.689.0
-  resolution: "@aws-sdk/client-s3@npm:3.689.0"
+"@aws-sdk/client-s3@npm:^3.685.0":
+  version: 3.686.0
+  resolution: "@aws-sdk/client-s3@npm:3.686.0"
   dependencies:
     "@aws-crypto/sha1-browser": "npm:5.2.0"
     "@aws-crypto/sha256-browser": "npm:5.2.0"
@@ -110,7 +110,7 @@ __metadata:
     "@aws-sdk/credential-provider-node": "npm:3.687.0"
     "@aws-sdk/middleware-bucket-endpoint": "npm:3.686.0"
     "@aws-sdk/middleware-expect-continue": "npm:3.686.0"
-    "@aws-sdk/middleware-flexible-checksums": "npm:3.689.0"
+    "@aws-sdk/middleware-flexible-checksums": "npm:3.686.0"
     "@aws-sdk/middleware-host-header": "npm:3.686.0"
     "@aws-sdk/middleware-location-constraint": "npm:3.686.0"
     "@aws-sdk/middleware-logger": "npm:3.686.0"
@@ -159,7 +159,7 @@ __metadata:
     "@smithy/util-utf8": "npm:^3.0.0"
     "@smithy/util-waiter": "npm:^3.1.7"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/002bd6285b33f2a78789aa83443712be3362b24db4ec592d5f15172186a69e5687a4450fda38c80f5fc7d2b7042515fca0bae60085e30848cc9c76aa418fa165
+  checksum: 10c0/5b7f222834846b77ee747746af197377fea65a14e817c3c564912517027fe45ea9bcc485acf3202019011b1706881dd4221552924d4d8cb873ed9b7af5ebf862
   languageName: node
   linkType: hard
 
@@ -470,9 +470,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-flexible-checksums@npm:3.689.0":
-  version: 3.689.0
-  resolution: "@aws-sdk/middleware-flexible-checksums@npm:3.689.0"
+"@aws-sdk/middleware-flexible-checksums@npm:3.686.0":
+  version: 3.686.0
+  resolution: "@aws-sdk/middleware-flexible-checksums@npm:3.686.0"
   dependencies:
     "@aws-crypto/crc32": "npm:5.2.0"
     "@aws-crypto/crc32c": "npm:5.2.0"
@@ -487,7 +487,7 @@ __metadata:
     "@smithy/util-stream": "npm:^3.2.1"
     "@smithy/util-utf8": "npm:^3.0.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/5bca4640456ede98f0a07f8cae6b00f27f531ab193277f4b88e2ede427ea71a448f55668cf76c70e3d1385420017ff14e458e9b3d9043979621881ba0aae767c
+  checksum: 10c0/56418559cf2a3d61f2acf0c903c82ea447863bc3d157da4b6b0b03f018d0e74fc8a4455d9fbc907afc59969cf62ad034f6aed88754f8fab3a405767a54014dd0
   languageName: node
   linkType: hard
 
@@ -2889,10 +2889,7 @@ __metadata:
   dependencies:
     "@eslint/js": "npm:^9.14.0"
     "@types/node": "npm:^22.9.0"
-    "@typescript-eslint/eslint-plugin": "npm:^8.14.0"
-    "@typescript-eslint/parser": "npm:^8.14.0"
-    eslint: "npm:^9.14.0"
-    globals: "npm:^15.12.0"
+    shared: "workspace:^"
     tsx: "npm:^4.19.2"
     typescript: "npm:^5.6.3"
     typescript-eslint: "npm:^8.14.0"
@@ -3366,9 +3363,9 @@ __metadata:
   linkType: hard
 
 "electron-to-chromium@npm:^1.5.41":
-  version: 1.5.52
-  resolution: "electron-to-chromium@npm:1.5.52"
-  checksum: 10c0/1c85a5710ad21758780b8e067d5f63ed00416dbe93f64bd8937dbfb4ed98cf93d80c471a30daed439cb91a00ff4942ea2628e00a69d56639cc7070e9e8ab2694
+  version: 1.5.55
+  resolution: "electron-to-chromium@npm:1.5.55"
+  checksum: 10c0/1b9e0970a591d342cf4d4c95b63bcdb8bffed01edb7c8baed8dd54ea769c8b33c07484c94a031a20363a8129ca2ad1d612ce4ca55ec831244240ae1e6bcdf07c
   languageName: node
   linkType: hard
 
@@ -5378,9 +5375,9 @@ __metadata:
   linkType: hard
 
 "object-inspect@npm:^1.13.1":
-  version: 1.13.2
-  resolution: "object-inspect@npm:1.13.2"
-  checksum: 10c0/b97835b4c91ec37b5fd71add84f21c3f1047d1d155d00c0fcd6699516c256d4fcc6ff17a1aced873197fe447f91a3964178fd2a67a1ee2120cdaf60e81a050b4
+  version: 1.13.3
+  resolution: "object-inspect@npm:1.13.3"
+  checksum: 10c0/cc3f15213406be89ffdc54b525e115156086796a515410a8d390215915db9f23c8eab485a06f1297402f440a33715fe8f71a528c1dcbad6e1a3bcaf5a46921d4
   languageName: node
   linkType: hard
 
@@ -5576,17 +5573,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"path@npm:0.12.7":
-  version: 0.12.7
-  resolution: "path@npm:0.12.7"
-  dependencies:
-    process: "npm:^0.11.1"
-    util: "npm:^0.10.3"
-  checksum: 10c0/f795ce5438a988a590c7b6dfd450ec9baa1c391a8be4c2dea48baa6e0f5b199e56cd83b8c9ebf3991b81bea58236d2c32bdafe2c17a2e70c3a2e4c69891ade59
-  languageName: node
-  linkType: hard
-
-"picocolors@npm:^1.0.0, picocolors@npm:^1.1.0, picocolors@npm:^1.1.1":
+"picocolors@npm:^1.0.0, picocolors@npm:^1.1.0":
   version: 1.1.1
   resolution: "picocolors@npm:1.1.1"
   checksum: 10c0/e2e3e8170ab9d7c7421969adaa7e1b31434f789afb9b3f115f6b96d91945041ac3ceb02e9ec6fe6510ff036bcc0bf91e69a1772edc0b707e12b19c0f2d6bcf58
@@ -5633,13 +5620,13 @@ __metadata:
   linkType: hard
 
 "postcss@npm:^8.4.43":
-  version: 8.4.47
-  resolution: "postcss@npm:8.4.47"
+  version: 8.4.48
+  resolution: "postcss@npm:8.4.48"
   dependencies:
     nanoid: "npm:^3.3.7"
     picocolors: "npm:^1.1.1"
     source-map-js: "npm:^1.2.1"
-  checksum: 10c0/929f68b5081b7202709456532cee2a145c1843d391508c5a09de2517e8c4791638f71dd63b1898dba6712f8839d7a6da046c72a5e44c162e908f5911f57b5f44
+  checksum: 10c0/d586361fda12fc7ab5650ce9b5763fc61d6ea2cecac9da98fceea6a3f27e42ed34db830582411bc06743492d9bb414c52b0c81da65440682d244d692da2f928a
   languageName: node
   linkType: hard
 
@@ -5964,15 +5951,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "rtmpServer@workspace:backend/rtmpServer"
   dependencies:
-    "@eslint/js": "npm:^9.13.0"
-    "@hoeeeeeh/node-media-server": "npm:2.7.28"
-    "@types/node": "npm:^22.9.0"
-    "@typescript-eslint/eslint-plugin": "npm:^8.14.0"
-    "@typescript-eslint/parser": "npm:^8.14.0"
     dotenv: "npm:^16.4.5"
-    eslint: "npm:^9.13.0"
-    globals: "npm:^15.11.0"
-    path: "npm:0.12.7"
+    nodeMediaServer: "workspace:^"
     tsx: "npm:^4.19.2"
     typescript: "npm:^5.6.3"
     typescript-eslint: "npm:^8.11.0"