diff --git a/package.json b/package.json
index a72d004..c135acc 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
     "fastify": "~1.5.0",
     "ioredis": "~3.2.2",
     "memory-cache": "~0.2.0",
-    "moment": "~2.22.2",
+    "moment": "~2.29.4",
     "murmurhash": "~0.0.2",
     "prom-client": "~11.0.0",
     "toobusy-js": "^0.5.1",
diff --git a/yarn.lock b/yarn.lock
index 161a9f1..59f470e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1470,11 +1470,7 @@ js-tokens@^4.0.0:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-<<<<<<< HEAD
 js-yaml@^3.11.0, js-yaml@^3.13.0:
-=======
-js-yaml@^3.11.0, js-yaml@^3.7.0:
->>>>>>> 32aebe17bcff2a6f068a7d50aabfcfe85fba2266
   version "3.13.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
   integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
@@ -1802,10 +1798,10 @@ mocha@~5.2.0:
     mkdirp "0.5.1"
     supports-color "5.4.0"
 
-moment@~2.22.2:
-  version "2.22.2"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66"
-  integrity sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y=
+moment@~2.29.4:
+  version "2.29.4"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
+  integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
 
 ms@2.0.0:
   version "2.0.0"