diff --git a/package-lock.json b/package-lock.json
index 87bc163..01493cf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -455,7 +455,6 @@
       }
     },
     "@magic/cli": {
-<<<<<<< HEAD
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/@magic/cli/-/cli-0.0.1.tgz",
       "integrity": "sha512-NX0mBmviN9LBPt1vKRXHdIw8Hi1A14QhlPyAWAle4ywsEgYd4Z/R+V+3cqAtQT7N9v4tJy1DcMO+0OReNf7Juw==",
@@ -491,47 +490,24 @@
       }
     },
     "@magic/deep": {
-=======
->>>>>>> 21311bbd016e2874d5fdd9f0d77a22e38e1e77da
       "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/@magic/cli/-/cli-0.0.1.tgz",
-      "integrity": "sha512-NX0mBmviN9LBPt1vKRXHdIw8Hi1A14QhlPyAWAle4ywsEgYd4Z/R+V+3cqAtQT7N9v4tJy1DcMO+0OReNf7Juw==",
-      "dev": true,
+      "resolved": "https://registry.npmjs.org/@magic/deep/-/deep-0.0.1.tgz",
+      "integrity": "sha512-HtZZoRCWmbUKhvWI+boe+zhme8Wf3AtqaT1ksTNVqaGXNSlQRJcnIXAT+l6/cUwZ4kB+kb6zSGSjW5uLQSztJw==",
       "requires": {
-        "@magic/log": "0.0.2",
         "@magic/types": "0.0.4"
       },
       "dependencies": {
-        "@magic/log": {
-          "version": "0.0.2",
-          "resolved": "https://registry.npmjs.org/@magic/log/-/log-0.0.2.tgz",
-          "integrity": "sha512-TJkm3d4iodC0j/7i3Ka272Tp6VI8gaRiI4dG89kL2z+Gk/WlOTSW+egzKqq9Y32PI64uR9GOIinVXKCaYAz8rg==",
-          "dev": true,
-          "requires": {
-            "@magic/types": "0.0.2"
-          },
-          "dependencies": {
-            "@magic/types": {
-              "version": "0.0.2",
-              "resolved": "https://registry.npmjs.org/@magic/types/-/types-0.0.2.tgz",
-              "integrity": "sha512-KYD3yKh3QvvdP1w6REnvgkg1LEWheteYBYXOKB6jNFAzq2eor/82yq9eJ6yig2weYjWxGpGuvJcpNL2hpQhaxg==",
-              "dev": true
-            }
-          }
+        "@magic/types": {
+          "version": "0.0.4",
+          "resolved": "https://registry.npmjs.org/@magic/types/-/types-0.0.4.tgz",
+          "integrity": "sha512-pDthyftYG7oRHi2ESO9O8QLvj2bLWeiwxTi+zhCPLaWAJi8yo/upOMIv18mEDD90pATH+cPDJjWEpFaY4JzVZQ=="
         }
       }
     },
-<<<<<<< HEAD
     "@magic/log": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/@magic/log/-/log-0.0.3.tgz",
       "integrity": "sha512-ksczkzNwOLd810biEBWY65cIi6XjH3/HKGkg/yP637jzIyastx0fiYnBM4Gjku3+q6M9M8c6lNUZsXq2KTTHBw==",
-=======
-    "@magic/deep": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/@magic/deep/-/deep-0.0.1.tgz",
-      "integrity": "sha512-HtZZoRCWmbUKhvWI+boe+zhme8Wf3AtqaT1ksTNVqaGXNSlQRJcnIXAT+l6/cUwZ4kB+kb6zSGSjW5uLQSztJw==",
->>>>>>> 21311bbd016e2874d5fdd9f0d77a22e38e1e77da
       "requires": {
         "@magic/types": "0.0.4"
       },
@@ -543,14 +519,6 @@
         }
       }
     },
-    "@magic/log": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/@magic/log/-/log-0.0.3.tgz",
-      "integrity": "sha512-ksczkzNwOLd810biEBWY65cIi6XjH3/HKGkg/yP637jzIyastx0fiYnBM4Gjku3+q6M9M8c6lNUZsXq2KTTHBw==",
-      "requires": {
-        "@magic/types": "0.0.4"
-      }
-    },
     "@magic/test": {
       "version": "0.0.12",
       "resolved": "https://registry.npmjs.org/@magic/test/-/test-0.0.12.tgz",
@@ -583,28 +551,19 @@
               "dev": true
             }
           }
-<<<<<<< HEAD
         },
         "@magic/types": {
           "version": "0.0.4",
           "resolved": "https://registry.npmjs.org/@magic/types/-/types-0.0.4.tgz",
           "integrity": "sha512-pDthyftYG7oRHi2ESO9O8QLvj2bLWeiwxTi+zhCPLaWAJi8yo/upOMIv18mEDD90pATH+cPDJjWEpFaY4JzVZQ==",
           "dev": true
-=======
->>>>>>> 21311bbd016e2874d5fdd9f0d77a22e38e1e77da
         }
       }
     },
     "@magic/types": {
-<<<<<<< HEAD
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/@magic/types/-/types-0.0.5.tgz",
-      "integrity": "sha512-MUE/y++B/A4tLohYgUBfE0zlxx9jSRb0AoODAdJ7UnL7aC6UMmIh4YR5ffk1Qu0pvLuKjv7tqRZslHahgda0wA=="
-=======
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/@magic/types/-/types-0.0.4.tgz",
-      "integrity": "sha512-pDthyftYG7oRHi2ESO9O8QLvj2bLWeiwxTi+zhCPLaWAJi8yo/upOMIv18mEDD90pATH+cPDJjWEpFaY4JzVZQ=="
->>>>>>> 21311bbd016e2874d5fdd9f0d77a22e38e1e77da
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/@magic/types/-/types-0.1.0.tgz",
+      "integrity": "sha512-MNEoDbxBFCc2V2yDNtZqSpCP4Wj6ON0VV/nUPAJqp4ItFPuZ67wTDnad1LHf1loWyhiiYK/CI2LMRSnsu2YfUA=="
     },
     "@mrmlnc/readdir-enhanced": {
       "version": "2.2.1",
diff --git a/package.json b/package.json
index f8991b1..0f1cc80 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
   "dependencies": {
     "@magic/deep": "0.0.1",
     "@magic/log": "0.0.3",
-    "@magic/types": "0.0.5",
+    "@magic/types": "0.1.0",
     "imagemin": "6.1.0",
     "imagemin-gifsicle": "6.0.1",
     "imagemin-jimp": "github:jaeh/imagemin-jimp",