diff --git a/package.json b/package.json
index 46731dac..747ff617 100644
--- a/package.json
+++ b/package.json
@@ -18,10 +18,13 @@
     "axios": "^0.21.1",
     "canvas": "^2.6.1",
     "chart.js": "^2.9.4",
+<<<<<<< HEAD
 <<<<<<< HEAD
     "core-js": "^3.10.1",
     "css-loader": "^5.2.4",
 =======
+=======
+>>>>>>> snyk-upgrade-c412a28c40c0cae2065493aa3835f296
     "core-js": "^3.10.2",
     "css-loader": "^5.2.2",
 >>>>>>> snyk-upgrade-c412a28c40c0cae2065493aa3835f296