diff --git a/packages/client/yarn.lock b/packages/client/yarn.lock
index 2c5c2fd61f..0864699225 100644
--- a/packages/client/yarn.lock
+++ b/packages/client/yarn.lock
@@ -23,8 +23,6 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-<<<<<<< HEAD
-=======
 "@jridgewell/gen-mapping@^0.3.0":
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9"
@@ -65,7 +63,6 @@
     "@jridgewell/resolve-uri" "^3.0.3"
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
->>>>>>> 7d16917f8d9018a6989908622a0fa1865854bcf2
 "@rollup/plugin-alias@^3.1.5":
   version "3.1.8"
   resolved "https://registry.yarnpkg.com/@rollup/plugin-alias/-/plugin-alias-3.1.8.tgz#645fd84659e08d3d1b059408fcdf69c1dd435a6b"
@@ -192,14 +189,11 @@
   dependencies:
     "@types/node" "*"
 
-<<<<<<< HEAD
-=======
 acorn@^8.5.0:
   version "8.7.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30"
   integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==
 
->>>>>>> 7d16917f8d9018a6989908622a0fa1865854bcf2
 alphanum-sort@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
@@ -1497,17 +1491,10 @@ svelte-spa-router@^3.0.5:
   dependencies:
     regexparam "2.0.0"
 
-<<<<<<< HEAD
-svelte@^3.38.2:
-  version "3.46.4"
-  resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.46.4.tgz#0c46bc4a3e20a2617a1b7dc43a722f9d6c084a38"
-  integrity sha512-qKJzw6DpA33CIa+C/rGp4AUdSfii0DOTCzj/2YpSKKayw5WGSS624Et9L1nU1k2OVRS9vaENQXp2CVZNU+xvIg==
-=======
 svelte@^3.49.0:
   version "3.49.0"
   resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.49.0.tgz#5baee3c672306de1070c3b7888fc2204e36a4029"
   integrity sha512-+lmjic1pApJWDfPCpUUTc1m8azDqYCG1JN9YEngrx/hUyIcFJo6VZhj0A1Ai0wqoHcEIuQy+e9tk+4uDgdtsFA==
->>>>>>> 7d16917f8d9018a6989908622a0fa1865854bcf2
 
 svg.draggable.js@^2.2.2:
   version "2.2.2"
@@ -1595,11 +1582,7 @@ timsort@^0.3.0:
 util-deprecate@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-<<<<<<< HEAD
-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
-=======
   integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
->>>>>>> 7d16917f8d9018a6989908622a0fa1865854bcf2
 
 wrap-ansi@^7.0.0:
   version "7.0.0"