diff --git a/package.json b/package.json
index 5f559b41..709116e8 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,11 @@
     "@types/node-persist": "^3.1.1",
     "@types/ramda": "types/npm-ramda#dist",
     "@types/react": "16.x.x",
+<<<<<<< HEAD
     "@types/uuid": "3.x.x",
+=======
+    "@types/uuid": "^8.3.1",
+>>>>>>> eacbbc1 (Add UUID)
     "babel-eslint": "^10.1.0",
     "babel-plugin-transform-es2015-modules-commonjs": "^6.26.2",
     "eslint": "^6.6.0",
diff --git a/yarn.lock b/yarn.lock
index 6b1053d6..54e5e012 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7410,6 +7410,11 @@ uuid@^7.0.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.3.tgz#c5c9f2c8cf25dc0a372c4df1441c41f5bd0c680b"
   integrity sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==
 
+uuid@^8.3.2:
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
+  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
+
 v8-compile-cache@^2.0.3:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz#e14de37b31a6d194f5690d67efc4e7f6fc6ab30e"