fix

Author: ota-meshi

package.json

@@ -90,13 +90,7 @@
     "mocha": "^10.0.0",
     "nyc": "^15.1.0",
     "prettier": "^2.6.2",
-<<<<<<< HEAD
-    "typescript": "^4.6.4",
-    "vitepress": "^1.0.0-alpha.29"
-=======
     "typescript": "^4.9.3",
-    "vue-eslint-editor": "^1.1.0",
-    "vuepress": "^1.9.7"
->>>>>>> da8cc13e (support for satisfies op)
+    "vitepress": "^1.0.0-alpha.29"
   }
 }