fix: package.json

Author: daviddias

package.json

@@ -73,13 +73,8 @@
     "form-data": "^2.3.2",
     "go-ipfs-dep": "^0.4.13",
     "hat": "0.0.3",
-<<<<<<< HEAD
     "interface-ipfs-core": "~0.50.1",
     "ipfsd-ctl": "~0.28.0",
-=======
-    "interface-ipfs-core": "~0.42.1",
-    "ipfsd-ctl": "~0.27.2",
->>>>>>> chore: fix rebase errors
     "left-pad": "^1.2.0",
     "lodash": "^4.17.5",
     "mocha": "^5.0.1",
@@ -102,35 +97,20 @@
     "byteman": "^1.3.5",
     "cids": "~0.5.2",
     "debug": "^3.1.0",
-<<<<<<< HEAD
     "file-type": "^7.5.0",
     "filesize": "^3.6.0",
-=======
-    "file-type": "^7.4.0",
-    "filesize": "^3.5.11",
->>>>>>> chore: merge conflicts
     "fsm-event": "^2.1.0",
     "get-folder-size": "^1.0.1",
     "glob": "^7.1.2",
     "hapi": "^16.6.2",
     "hapi-set-header": "^1.0.2",
-<<<<<<< HEAD
     "hoek": "^5.0.3",
     "ipfs-api": "^18.0.0",
     "ipfs-bitswap": "~0.19.0",
     "ipfs-block": "~0.6.1",
     "ipfs-block-service": "~0.13.0",
     "ipfs-multipart": "~0.1.0",
     "ipfs-repo": "~0.18.7",
-=======
-    "hoek": "^5.0.2",
-    "ipfs-api": "^17.3.0",
-    "ipfs-bitswap": "~0.18.0",
-    "ipfs-block": "~0.6.1",
-    "ipfs-block-service": "~0.13.0",
-    "ipfs-multipart": "~0.1.0",
-    "ipfs-repo": "~0.18.5",
->>>>>>> chore: merge conflicts
     "ipfs-unixfs": "~0.1.14",
     "ipfs-unixfs-engine": "~0.24.2",
     "ipld-resolver": "~0.14.1",