fix: resolve conflict

Author: hg-pyun

package.json

@@ -4,42 +4,29 @@
   "scripts": {
     "analyze": "ANALYZE=true next build",
     "dev": "next-remote-watch ./src/content",
-<<<<<<< HEAD
     "build": "yarn cache-reset && next build && node --experimental-modules ./scripts/downloadFonts.mjs",
-    "lint": "next lint",
-    "lint:fix": "next lint --fix",
-=======
-    "build": "next build && node --experimental-modules ./scripts/downloadFonts.mjs",
     "lint": "next lint && eslint \"src/content/**/*.md\"",
     "lint:fix": "next lint --fix && eslint \"src/content/**/*.md\" --fix",
->>>>>>> 0d05d9b6ef0f115ec0b96a2726ab0699a9ebafe1
     "format:source": "prettier --config .prettierrc --write \"{plugins,src}/**/*.{js,ts,jsx,tsx,css}\"",
     "nit:source": "prettier --config .prettierrc --list-different \"{plugins,src}/**/*.{js,ts,jsx,tsx,css}\"",
     "prettier": "yarn format:source",
     "prettier:diff": "yarn nit:source",
     "lint-heading-ids": "node scripts/headingIdLinter.js",
     "fix-headings": "node scripts/headingIdLinter.js --fix",
-<<<<<<< HEAD
-    "ci-check": "npm-run-all prettier:diff --parallel lint tsc lint-heading-ids rss lint-editorconfig",
-=======
-    "ci-check": "npm-run-all prettier:diff --parallel lint tsc lint-heading-ids rss deadlinks",
->>>>>>> 0d05d9b6ef0f115ec0b96a2726ab0699a9ebafe1
+    "ci-check": "npm-run-all prettier:diff --parallel lint tsc lint-heading-ids rss deadlinks lint-editorconfig",
     "tsc": "tsc --noEmit",
     "start": "next start",
     "postinstall": "yarn --cwd eslint-local-rules install && is-ci || husky install .husky",
     "check-all": "npm-run-all prettier lint:fix tsc rss",
     "rss": "node scripts/generateRss.js",
-<<<<<<< HEAD
     "cache-reset": "rm -rf node_modules/.cache && rm -rf .next && yarn cache clean",
     "lint-editorconfig": "yarn editorconfig-checker",
     "textlint-test": "yarn mocha ./textlint/tests/utils && yarn mocha ./textlint/tests/rules",
     "textlint-docs": "node ./textlint/generators/genTranslateGlossaryDocs.js && git add wiki/translate-glossary.md",
-    "textlint-lint": "yarn textlint ./src/content --rulesdir ./textlint/rules -f pretty-error && npx --yes eslint@9 -c eslint.config.mjs"
-=======
+    "textlint-lint": "yarn textlint ./src/content --rulesdir ./textlint/rules -f pretty-error && npx --yes eslint@9 -c eslint.config.mjs",
     "deadlinks": "node scripts/deadLinkChecker.js",
     "copyright": "node scripts/copyright.js",
     "test:eslint-local-rules": "yarn --cwd eslint-local-rules test"
->>>>>>> 0d05d9b6ef0f115ec0b96a2726ab0699a9ebafe1
   },
   "dependencies": {
     "@codesandbox/sandpack-react": "2.13.5",
@@ -79,24 +66,17 @@
     "asyncro": "^3.0.0",
     "autoprefixer": "^10.4.2",
     "babel-eslint": "10.x",
-<<<<<<< HEAD
     "babel-plugin-react-compiler": "19.0.0-beta-e552027-20250112",
-    "editorconfig-checker": "^6.0.1",
-=======
-    "babel-plugin-react-compiler": "^1.0.0",
     "chalk": "4.1.2",
->>>>>>> 0d05d9b6ef0f115ec0b96a2726ab0699a9ebafe1
+    "editorconfig-checker": "^6.0.1",
     "eslint": "7.x",
     "eslint-config-next": "12.0.3",
     "eslint-config-react-app": "^5.2.1",
     "eslint-plugin-flowtype": "4.x",
     "eslint-plugin-import": "2.x",
     "eslint-plugin-jsx-a11y": "6.x",
-<<<<<<< HEAD
-    "eslint-plugin-mark": "^0.1.0-canary.2",
-=======
     "eslint-plugin-local-rules": "link:eslint-local-rules",
->>>>>>> 0d05d9b6ef0f115ec0b96a2726ab0699a9ebafe1
+    "eslint-plugin-mark": "^0.1.0-canary.2",
     "eslint-plugin-react": "7.x",
     "eslint-plugin-react-compiler": "^19.0.0-beta-e552027-20250112",
     "eslint-plugin-react-hooks": "^0.0.0-experimental-fabef7a6b-20221215",