diff --git a/yarn.lock b/yarn.lock
index 34f8d48..12913cd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2988,20 +2988,12 @@ screenfull@^3.3.2:
   resolved "https://registry.yarnpkg.com/screenfull/-/screenfull-3.3.3.tgz#8cf7e706aceac2e75131aadcb81b622acfe11d39"
   integrity sha512-DzYUuXr+OV2BDvYXaYzlYgJd4WXZZ2CW5NFC7Kw6TUCpzXJAx4MwlVD6CH+Mu6fi8rfAQIQfqdFZ4jtDsEkWig==
 
-<<<<<<< HEAD
 semver@^6.3.0, semver@^6.3.1:
-=======
-semver@^6.3.0:
->>>>>>> 4ddc8c25577e64a94247419da1e09e3deb615c4c
   version "6.3.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-<<<<<<< HEAD
 semver@^7.3.5, semver@^7.3.7, semver@^7.5.4:
-=======
-semver@^7.3.5, semver@^7.3.7, semver@^7.3.8:
->>>>>>> 4ddc8c25577e64a94247419da1e09e3deb615c4c
   version "7.5.4"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
   integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==