diff --git a/package-lock.json b/package-lock.json
index 5aade551a4..d93be5fd64 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5020,8 +5020,14 @@
         },
         "get-stream": {
           "version": "3.0.0",
+<<<<<<< HEAD
+          "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
+          "optional": true
+=======
           "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
           "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
+>>>>>>> develop
         },
         "got": {
           "version": "8.3.2",
@@ -8049,8 +8055,14 @@
       "dependencies": {
         "pify": {
           "version": "2.3.0",
+<<<<<<< HEAD
+          "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "optional": true
+=======
           "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
           "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
+>>>>>>> develop
         }
       }
     },
@@ -8133,8 +8145,14 @@
       "dependencies": {
         "file-type": {
           "version": "3.9.0",
+<<<<<<< HEAD
+          "resolved": "http://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
+          "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=",
+          "optional": true
+=======
           "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
           "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek="
+>>>>>>> develop
         },
         "get-stream": {
           "version": "2.3.1",
@@ -8148,8 +8166,14 @@
         },
         "pify": {
           "version": "2.3.0",
+<<<<<<< HEAD
+          "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "optional": true
+=======
           "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
           "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
+>>>>>>> develop
         }
       }
     },
@@ -8591,8 +8615,14 @@
         },
         "get-stream": {
           "version": "3.0.0",
+<<<<<<< HEAD
+          "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
+          "optional": true
+=======
           "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
           "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
+>>>>>>> develop
         },
         "got": {
           "version": "7.1.0",
@@ -11147,11 +11177,23 @@
         },
         "balanced-match": {
           "version": "1.0.0",
+<<<<<<< HEAD
+          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+          "optional": true
+        },
+        "brace-expansion": {
+          "version": "1.1.11",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+          "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+          "optional": true,
+=======
           "bundled": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
+>>>>>>> develop
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -11164,6 +11206,23 @@
         },
         "code-point-at": {
           "version": "1.1.0",
+<<<<<<< HEAD
+          "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+          "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+          "optional": true
+        },
+        "concat-map": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+          "optional": true
+        },
+        "console-control-strings": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+          "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
+          "optional": true
+=======
           "bundled": true
         },
         "concat-map": {
@@ -11173,6 +11232,7 @@
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true
+>>>>>>> develop
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -11275,7 +11335,13 @@
         },
         "inherits": {
           "version": "2.0.3",
+<<<<<<< HEAD
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+          "optional": true
+=======
           "bundled": true
+>>>>>>> develop
         },
         "ini": {
           "version": "1.3.5",
@@ -11284,7 +11350,13 @@
         },
         "is-fullwidth-code-point": {
           "version": "1.0.0",
+<<<<<<< HEAD
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+          "optional": true,
+=======
           "bundled": true,
+>>>>>>> develop
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -11296,18 +11368,36 @@
         },
         "minimatch": {
           "version": "3.0.4",
+<<<<<<< HEAD
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+          "optional": true,
+=======
           "bundled": true,
+>>>>>>> develop
           "requires": {
             "brace-expansion": "^1.1.7"
           }
         },
         "minimist": {
           "version": "0.0.8",
+<<<<<<< HEAD
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+          "optional": true
+        },
+        "minipass": {
+          "version": "2.2.4",
+          "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.2.4.tgz",
+          "integrity": "sha512-hzXIWWet/BzWhYs2b+u7dRHlruXhwdgvlTMDKC6Cb1U7ps6Ac6yQlR39xsbjWJE377YTCtKwIXIpJ5oP+j5y8g==",
+          "optional": true,
+=======
           "bundled": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
+>>>>>>> develop
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -11323,7 +11413,13 @@
         },
         "mkdirp": {
           "version": "0.5.1",
+<<<<<<< HEAD
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+          "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+          "optional": true,
+=======
           "bundled": true,
+>>>>>>> develop
           "requires": {
             "minimist": "0.0.8"
           }
@@ -11396,7 +11492,13 @@
         },
         "number-is-nan": {
           "version": "1.0.1",
+<<<<<<< HEAD
+          "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+          "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+          "optional": true
+=======
           "bundled": true
+>>>>>>> develop
         },
         "object-assign": {
           "version": "4.1.1",
@@ -11405,7 +11507,13 @@
         },
         "once": {
           "version": "1.4.0",
+<<<<<<< HEAD
+          "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+          "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+          "optional": true,
+=======
           "bundled": true,
+>>>>>>> develop
           "requires": {
             "wrappy": "1"
           }
@@ -11510,7 +11618,13 @@
         },
         "string-width": {
           "version": "1.0.2",
+<<<<<<< HEAD
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "optional": true,
+=======
           "bundled": true,
+>>>>>>> develop
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -13197,9 +13311,9 @@
       "integrity": "sha1-SMptcvbGo68Aqa1K5odr44ieKwk="
     },
     "image-size": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.6.3.tgz",
-      "integrity": "sha512-47xSUiQioGaB96nqtp5/q55m0aBQSQdyIloMOc/x+QVTDZLNmXE892IIDrJ0hM1A5vcNUDD5tDffkSP5lCaIIA=="
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.7.0.tgz",
+      "integrity": "sha512-oWhJUMBxKQhmdSUPw+bcU+JC9pUMBbLnDPIZCFxZWGajV2HCRA5n+fHCCT3qDPGbGVEwP2cYTP2efsSk8j0YKA=="
     },
     "imagemin": {
       "version": "6.1.0",
@@ -25602,18 +25716,39 @@
       "integrity": "sha1-rOEWq1V80Zc4ak6I9GhTeMiy5Po="
     },
     "unbzip2-stream": {
+<<<<<<< HEAD
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.3.1.tgz",
+      "integrity": "sha512-fIZnvdjblYs7Cru/xC6tCPVhz7JkYcVQQkePwMLyQELzYTds2Xn8QefPVnvdVhhZqubxNA1cASXEH5wcK0Bucw==",
+      "optional": true,
+=======
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz",
       "integrity": "sha512-fUlAF7U9Ah1Q6EieQ4x4zLNejrRvDWUYmxXUpN3uziFYCHapjWFaCAnreY9bGgxzaMCFAPPpYNng57CypwJVhg==",
+>>>>>>> develop
       "requires": {
         "buffer": "^5.2.1",
         "through": "^2.3.8"
       },
       "dependencies": {
+<<<<<<< HEAD
+        "base64-js": {
+          "version": "0.0.8",
+          "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz",
+          "integrity": "sha1-EQHpVE9KdrG8OybUUsqW16NeeXg=",
+          "optional": true
+        },
+        "buffer": {
+          "version": "3.6.0",
+          "resolved": "http://registry.npmjs.org/buffer/-/buffer-3.6.0.tgz",
+          "integrity": "sha1-pyyTb3e5a/UvX357RnGAYoVR3vs=",
+          "optional": true,
+=======
         "buffer": {
           "version": "5.2.1",
           "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz",
           "integrity": "sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==",
+>>>>>>> develop
           "requires": {
             "base64-js": "^1.0.2",
             "ieee754": "^1.1.4"
diff --git a/package.json b/package.json
index f1d46db061..aa5fd4644c 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
     "habitica-markdown": "^1.3.0",
     "hellojs": "^1.15.1",
     "html-webpack-plugin": "^3.2.0",
-    "image-size": "^0.6.2",
+    "image-size": "^0.7.0",
     "in-app-purchase": "^1.10.2",
     "intro.js": "^2.9.3",
     "jquery": ">=3.0.0",