diff --git a/.changeset/giant-hats-camp.md b/.changeset/giant-hats-camp.md
new file mode 100644
index 00000000000..c03977e3c3f
--- /dev/null
+++ b/.changeset/giant-hats-camp.md
@@ -0,0 +1,6 @@
+---
+"graphql-language-service-cli": patch
+"graphql-language-service": patch
+---
+
+fix lockfile and imports from LSP merge
diff --git a/.changeset/rude-walls-mix.md b/.changeset/rude-walls-mix.md
new file mode 100644
index 00000000000..79e98e6f71d
--- /dev/null
+++ b/.changeset/rude-walls-mix.md
@@ -0,0 +1,5 @@
+---
+'graphql-language-service': patch
+---
+
+default to es6 target across the language services, fix #2240
diff --git a/packages/graphql-language-service-cli/package.json b/packages/graphql-language-service-cli/package.json
index 767d3fc4e6c..22115ec190a 100644
--- a/packages/graphql-language-service-cli/package.json
+++ b/packages/graphql-language-service-cli/package.json
@@ -33,8 +33,6 @@
   "dependencies": {
     "@babel/polyfill": "^7.8.7",
     "graphql-language-service": "^5.0.0",
-    "graphql-language-service-server": "^2.7.16",
-    "graphql-language-service-utils": "^2.7.1",
     "yargs": "^16.2.0"
   },
   "devDependencies": {
diff --git a/yarn.lock b/yarn.lock
index 671f3e37e92..f7f411c7d8e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11265,16 +11265,16 @@ grapheme-splitter@^1.0.4:
   integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
 
 "graphiql@file:packages/graphiql":
-  version "1.6.0"
+  version "1.7.1"
   dependencies:
     "@graphiql/toolkit" "^0.4.2"
     codemirror "^5.58.2"
-    codemirror-graphql "^1.2.12"
+    codemirror-graphql "^1.2.13"
     copy-to-clipboard "^3.2.0"
     dset "^3.1.0"
     entities "^2.0.0"
     escape-html "^1.0.3"
-    graphql-language-service "^4.1.5"
+    graphql-language-service "^5.0.0"
     markdown-it "^12.2.0"
 
 graphql-config@^4.1.0: