diff --git a/package-lock.json b/package-lock.json
index a4ac0b2..f8694ac 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1247,16 +1247,6 @@
       "integrity": "sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==",
       "requires": {
         "@emotion/memoize": "0.7.4"
-<<<<<<< HEAD
-=======
-      },
-      "dependencies": {
-        "@emotion/memoize": {
-          "version": "0.7.4",
-          "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz",
-          "integrity": "sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw=="
-        }
->>>>>>> d576f02197db7daa96d47b140c029f5260131eca
       }
     },
     "@emotion/memoize": {
@@ -1340,15 +1330,9 @@
       }
     },
     "@emotion/sheet": {
-<<<<<<< HEAD
       "version": "0.9.4",
       "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-0.9.4.tgz",
       "integrity": "sha512-zM9PFmgVSqBw4zL101Q0HrBVTGmpAxFZH/pYx/cjJT5advXguvcgjHFTCaIO3enL/xr89vK2bh0Mfyj9aa0ANA=="
-=======
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.0.1.tgz",
-      "integrity": "sha512-GbIvVMe4U+Zc+929N1V7nW6YYJtidj31lidSmdYcWozwoBIObXBnaJkKNDjZrLm9Nc0BR+ZyHNaRZxqNZbof5g=="
->>>>>>> d576f02197db7daa96d47b140c029f5260131eca
     },
     "@emotion/stylis": {
       "version": "0.8.5",
@@ -2351,10 +2335,7 @@
       "version": "8.1.0",
       "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-8.1.0.tgz",
       "integrity": "sha512-kmW9alndr19qd6DABzQ978zKQ+J65gU2Rzkl8hriIetPnwpesRaK4//jEQyYh8fEALmGhomD/LBQqt+o+DL95Q==",
-<<<<<<< HEAD
       "peer": true,
-=======
->>>>>>> d576f02197db7daa96d47b140c029f5260131eca
       "requires": {
         "@babel/code-frame": "^7.10.4",
         "@babel/runtime": "^7.12.5",
@@ -2367,16 +2348,10 @@
       },
       "dependencies": {
         "@babel/runtime": {
-<<<<<<< HEAD
           "version": "7.14.6",
           "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.6.tgz",
           "integrity": "sha512-/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg==",
           "peer": true,
-=======
-          "version": "7.14.8",
-          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.8.tgz",
-          "integrity": "sha512-twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg==",
->>>>>>> d576f02197db7daa96d47b140c029f5260131eca
           "requires": {
             "regenerator-runtime": "^0.13.4"
           }
@@ -2385,10 +2360,7 @@
           "version": "27.0.6",
           "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.0.6.tgz",
           "integrity": "sha512-aSquT1qa9Pik26JK5/3rvnYb4bGtm1VFNesHKmNTwmPIgOrixvhL2ghIvFRNEpzy3gU+rUgjIF/KodbkFAl++g==",
-<<<<<<< HEAD
           "peer": true,
-=======
->>>>>>> d576f02197db7daa96d47b140c029f5260131eca
           "requires": {
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
@@ -2401,10 +2373,7 @@
           "version": "16.0.4",
           "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
           "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-<<<<<<< HEAD
           "peer": true,
-=======
->>>>>>> d576f02197db7daa96d47b140c029f5260131eca
           "requires": {
             "@types/yargs-parser": "*"
           }
@@ -2413,10 +2382,7 @@
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-<<<<<<< HEAD
           "peer": true,
-=======
->>>>>>> d576f02197db7daa96d47b140c029f5260131eca
           "requires": {
             "color-convert": "^2.0.1"
           }
@@ -2425,10 +2391,7 @@
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
           "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-<<<<<<< HEAD
           "peer": true,
-=======
->>>>>>> d576f02197db7daa96d47b140c029f5260131eca
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
@@ -2438,10 +2401,7 @@
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-<<<<<<< HEAD
           "peer": true,
-=======
->>>>>>> d576f02197db7daa96d47b140c029f5260131eca
           "requires": {
             "color-name": "~1.1.4"
           }
@@ -2449,31 +2409,20 @@
         "color-name": {
           "version": "1.1.4",
           "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-<<<<<<< HEAD
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "peer": true
-=======
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
->>>>>>> d576f02197db7daa96d47b140c029f5260131eca
         },
         "has-flag": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-<<<<<<< HEAD
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "peer": true
-=======
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
->>>>>>> d576f02197db7daa96d47b140c029f5260131eca
         },
         "pretty-format": {
           "version": "27.0.6",
           "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.0.6.tgz",
           "integrity": "sha512-8tGD7gBIENgzqA+UBzObyWqQ5B778VIFZA/S66cclyd5YkFLYs2Js7gxDKf0MXtTc9zcS7t1xhdfcElJ3YIvkQ==",
-<<<<<<< HEAD
           "peer": true,
-=======
->>>>>>> d576f02197db7daa96d47b140c029f5260131eca
           "requires": {
             "@jest/types": "^27.0.6",
             "ansi-regex": "^5.0.0",
@@ -2484,12 +2433,8 @@
             "ansi-styles": {
               "version": "5.2.0",
               "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-<<<<<<< HEAD
               "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
               "peer": true
-=======
-              "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
->>>>>>> d576f02197db7daa96d47b140c029f5260131eca
             }
           }
         },
@@ -2497,10 +2442,7 @@
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-<<<<<<< HEAD
           "peer": true,
-=======
->>>>>>> d576f02197db7daa96d47b140c029f5260131eca
           "requires": {
             "has-flag": "^4.0.0"
           }
@@ -13046,12 +12988,8 @@
     "react-icons": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-4.2.0.tgz",
-<<<<<<< HEAD
       "integrity": "sha512-rmzEDFt+AVXRzD7zDE21gcxyBizD/3NqjbX6cmViAgdqfJ2UiLer8927/QhhrXQV7dEj/1EGuOTPp7JnLYVJKQ==",
       "requires": {}
-=======
-      "integrity": "sha512-rmzEDFt+AVXRzD7zDE21gcxyBizD/3NqjbX6cmViAgdqfJ2UiLer8927/QhhrXQV7dEj/1EGuOTPp7JnLYVJKQ=="
->>>>>>> d576f02197db7daa96d47b140c029f5260131eca
     },
     "react-input-autosize": {
       "version": "3.0.0",
@@ -13373,7 +13311,6 @@
         "classnames": "^2.2.6",
         "invariant": "^2.2.4",
         "react-transition-group": "^2.4.0"
-<<<<<<< HEAD
       }
     },
     "react-transition-group": {
@@ -13385,40 +13322,6 @@
         "loose-envify": "^1.4.0",
         "prop-types": "^15.6.2",
         "react-lifecycles-compat": "^3.0.4"
-=======
-      },
-      "dependencies": {
-        "dom-helpers": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.4.0.tgz",
-          "integrity": "sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==",
-          "requires": {
-            "@babel/runtime": "^7.1.2"
-          }
-        },
-        "react-transition-group": {
-          "version": "2.9.0",
-          "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.9.0.tgz",
-          "integrity": "sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==",
-          "requires": {
-            "dom-helpers": "^3.4.0",
-            "loose-envify": "^1.4.0",
-            "prop-types": "^15.6.2",
-            "react-lifecycles-compat": "^3.0.4"
-          }
-        }
-      }
-    },
-    "react-transition-group": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.2.tgz",
-      "integrity": "sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg==",
-      "requires": {
-        "@babel/runtime": "^7.5.5",
-        "dom-helpers": "^5.0.1",
-        "loose-envify": "^1.4.0",
-        "prop-types": "^15.6.2"
->>>>>>> d576f02197db7daa96d47b140c029f5260131eca
       }
     },
     "read-pkg": {
@@ -17541,3 +17444,4 @@
     }
   }
 }
+}
\ No newline at end of file