diff --git a/package-lock.json b/package-lock.json
index 0d946e8e..399e9285 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -118,13 +118,8 @@
     },
     "@types/node": {
       "version": "14.14.10",
-<<<<<<< HEAD
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.9.tgz",
-      "integrity": "sha512-JsoLXFppG62tWTklIoO4knA+oDTYsmqWxHRvd4lpmfQRNhX6osheUOWETP2jMoV/2bEHuMra8Pp3Dmo/stBFcw=="
-=======
       "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.10.tgz",
       "integrity": "sha512-J32dgx2hw8vXrSbu4ZlVhn1Nm3GbeCFNw2FWL8S5QKucHGY0cyNwjdQdO+KMBZ4wpmC7KhLCiNsdk1RFRIYUQQ=="
->>>>>>> dd3272caefb3fbe48ccad272b48e68d6f45b776e
     },
     "@typescript-eslint/eslint-plugin": {
       "version": "4.8.2",