diff --git a/app/package-lock.json b/app/package-lock.json
index 864e226..df94e86 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -46,9 +46,15 @@
       }
     },
     "@octokit/graphql": {
+<<<<<<< HEAD
       "version": "4.5.6",
       "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.5.6.tgz",
       "integrity": "sha512-Rry+unqKTa3svswT2ZAuqenpLrzJd+JTv89LTeVa5UM/5OX8o4KTkPL7/1ABq4f/ZkELb0XEK/2IEoYwykcLXg==",
+=======
+      "version": "4.5.5",
+      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.5.5.tgz",
+      "integrity": "sha512-hi4lvdXTU8AsMMxnwBvi/aDZbbCohM46/kZjePQce+gkfbAseCP1D8tdHPszQ5j1bDALzgazCLMeF/dzqaiA/g==",
+>>>>>>> 14184d492b97fa9e9eae816484319bcf44109572
       "requires": {
         "@octokit/request": "^5.3.0",
         "@octokit/types": "^5.0.0",