diff --git a/package-lock.json b/package-lock.json
index 550046d..1273907 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2130,6 +2130,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
       "version": "1.5.38",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.38.tgz",
@@ -2187,6 +2188,12 @@
       "integrity": "sha512-7lXb9dAvimCFdvUMTyucD4mnIndt/xhRKFAlky0CyFogdnNmdPQNoHI23msF/2V4mpTxMzgMdjK4+YRlFlRQZw==",
       "dev": true
 >>>>>>> 0f9fa68 (automated changes (#275))
+=======
+      "version": "1.5.60",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.60.tgz",
+      "integrity": "sha512-HcraRUkTKJ+8yA3b10i9qvhUlPBRDlKjn1XGek1zDGVfAKcvi8TsUnImGqLiEm9j6ZulxXIWWIo9BmbkbCTGgA==",
+      "dev": true
+>>>>>>> f0348a5 (automated changes (#279))
     },
     "node_modules/emittery": {
       "version": "0.13.1",