chore: resolve conflicts in package.json and yarn.lock

Author: lumirlumir

package.json

@@ -65,11 +65,7 @@
     "asyncro": "^3.0.0",
     "autoprefixer": "^10.4.2",
     "babel-eslint": "10.x",
-<<<<<<< HEAD
     "editorconfig-checker": "^6.0.0",
-=======
-    "babel-plugin-react-compiler": "19.0.0-beta-e552027-20250112",
->>>>>>> a5aad0d5e92872ef715b462b1dd6dcbeb45cf781
     "eslint": "7.x",
     "eslint-config-next": "12.0.3",
     "eslint-config-react-app": "^5.2.1",
@@ -104,15 +100,11 @@
     "retext-smartypants": "^4.0.0",
     "rss": "^1.2.2",
     "tailwindcss": "^3.4.1",
-<<<<<<< HEAD
     "textlint": "^14.0.4",
     "textlint-filter-rule-comments": "^1.2.2",
     "textlint-rule-allowed-uris": "^1.0.7",
     "textlint-tester": "^14.0.4",
     "typescript": "^4.0.2",
-=======
-    "typescript": "^5.7.2",
->>>>>>> a5aad0d5e92872ef715b462b1dd6dcbeb45cf781
     "unist-util-visit": "^2.0.3",
     "webpack-bundle-analyzer": "^4.5.0"
   },
@@ -123,14 +115,5 @@
     "budget": null,
     "budgetPercentIncreaseRed": 10,
     "showDetails": true
-<<<<<<< HEAD
   }
-=======
-  },
-  "lint-staged": {
-    "*.{js,ts,jsx,tsx,css}": "yarn prettier",
-    "src/**/*.md": "yarn fix-headings"
-  },
-  "packageManager": "yarn@1.22.22"
->>>>>>> a5aad0d5e92872ef715b462b1dd6dcbeb45cf781
 }