diff --git a/package.json b/package.json
index cb79f6c5..2089f239 100644
--- a/package.json
+++ b/package.json
@@ -17,8 +17,14 @@
     "babel-preset-es2015": "^6.24.1",
     "bootstrap": "^5.1.3",
     "debounce": "^1.2.1",
+<<<<<<< HEAD
     "esbuild": "^0.13.6",
     "sass": "^1.43.4"
+=======
+    "esbuild": "^0.17.12",
+    "sass": "^1.43.4",
+    "semver": "7.5.2"
+>>>>>>> eaef648 (upgraded semver to 7.5.2 and adding updated files package.json and yarn.lock)
   },
   "scripts": {
     "build": "esbuild app/javascript/*.* --bundle --outdir=app/assets/builds",
diff --git a/yarn.lock b/yarn.lock
index 98ea8380..73435142 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3971,10 +3971,19 @@ saxes@^5.0.1:
   dependencies:
     xmlchars "^2.2.0"
 
+<<<<<<< HEAD
 semver@7.0.0:
   version "7.0.0"
   resolved "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
+=======
+semver@7.5.2:
+  version "7.5.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.2.tgz#5b851e66d1be07c1cdaf37dfc856f543325a2beb"
+  integrity sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==
+  dependencies:
+    lru-cache "^6.0.0"
+>>>>>>> eaef648 (upgraded semver to 7.5.2 and adding updated files package.json and yarn.lock)
 
 semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
   version "6.3.0"