Fix merge

3 files changed, 28 insertions, 22 deletions

diff --git a/packages/0x.js/CHANGELOG.json b/packages/0x.js/CHANGELOG.json
index 66ada59e8..8196a039f 100644
--- a/packages/0x.js/CHANGELOG.json
+++ b/packages/0x.js/CHANGELOG.json
@@ -18,7 +18,8 @@
                 "pr": 914,
                 "note": "Update ecSignOrderHashAsync to return the signature as a string for immediate use in contracts"
             }
-        ]
+        ],
+        "timestamp": 1534210131
     },
     {
         "version": "1.0.1-rc.2",
diff --git a/packages/0x.js/CHANGELOG.md b/packages/0x.js/CHANGELOG.md
index 5fe0f0c25..adeaed9eb 100644
--- a/packages/0x.js/CHANGELOG.md
+++ b/packages/0x.js/CHANGELOG.md
@@ -5,6 +5,11 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.1-rc.3 - _August 13, 2018_
+
+    * Dependencies updated
+    * Update ecSignOrderHashAsync to return the signature as a string for immediate use in contracts (#914)
+
 ## v1.0.1-rc.2 - _July 26, 2018_
 
     * Fixed bug caused by importing non-existent dep
@@ -17,11 +22,11 @@ CHANGELOG
 
     * Dependencies updated
 
-## v1.0.0-rc.2 - _July 20, 2018_
+## v1.0.0-rc.2 - _July 19, 2018_
 
     * Remove `zeroEx.assetData`  and instead re-export it's static functions directly off `ZeroEx`
 
-## v1.0.0-rc.1 - _July 20, 2018_
+## v1.0.0-rc.1 - _July 19, 2018_
 
     * Remove tokenRegistry wrapper (#863)
     * Rename `zeroEx.token` to `zeroEx.erc20Token`, and add `zeroEx.erc721Token` (#863)
@@ -61,7 +66,7 @@ CHANGELOG
     * Renamed createOrderStateWatcher to createOrderWatcherAsync since it is now async (#579)
     * Renamed ZeroExError to ContractWrappersErrors since they now lives in the @0xproject/contract-wrappers subpackage (#579)
 
-## v0.37.2 - _May 5, 2018_
+## v0.37.2 - _May 4, 2018_
 
     * Dependencies updated
 
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index 98a74633d..e76d2d966 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -1,6 +1,6 @@
 {
     "name": "0x.js",
-    "version": "1.0.1-rc.2",
+    "version": "1.0.1-rc.3",
     "engines": {
         "node": ">=6.12"
     },
@@ -57,11 +57,11 @@
     },
     "license": "Apache-2.0",
     "devDependencies": {
-        "@0xproject/abi-gen": "^1.0.4",
-        "@0xproject/dev-utils": "^1.0.3",
-        "@0xproject/migrations": "^1.0.3",
-        "@0xproject/monorepo-scripts": "^1.0.4",
-        "@0xproject/tslint-config": "^1.0.4",
+        "@0xproject/abi-gen": "^1.0.5",
+        "@0xproject/dev-utils": "^1.0.4",
+        "@0xproject/migrations": "^1.0.4",
+        "@0xproject/monorepo-scripts": "^1.0.5",
+        "@0xproject/tslint-config": "^1.0.5",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^2.2.42",
         "@types/node": "^8.0.53",
@@ -87,18 +87,18 @@
         "webpack": "^3.1.0"
     },
     "dependencies": {
-        "@0xproject/assert": "^1.0.4",
-        "@0xproject/base-contract": "^1.0.4",
-        "@0xproject/contract-wrappers": "^1.0.1-rc.2",
-        "@0xproject/order-utils": "^1.0.1-rc.2",
-        "@0xproject/order-watcher": "1.0.1-rc.2",
-        "@0xproject/sol-compiler": "^1.0.4",
-        "@0xproject/subproviders": "^1.0.4",
-        "@0xproject/types": "^1.0.1-rc.3",
-        "@0xproject/typescript-typings": "^1.0.3",
-        "@0xproject/utils": "^1.0.4",
-        "@0xproject/web3-wrapper": "^1.1.2",
-        "ethereum-types": "^1.0.3",
+        "@0xproject/assert": "^1.0.5",
+        "@0xproject/base-contract": "^2.0.0-rc.1",
+        "@0xproject/contract-wrappers": "^1.0.1-rc.3",
+        "@0xproject/order-utils": "^1.0.1-rc.3",
+        "@0xproject/sol-compiler": "^1.0.5",
+        "@0xproject/order-watcher": "1.0.1-rc.3",
+        "@0xproject/subproviders": "^1.0.5",
+        "@0xproject/types": "^1.0.1-rc.4",
+        "@0xproject/typescript-typings": "^1.0.4",
+        "@0xproject/utils": "^1.0.5",
+        "@0xproject/web3-wrapper": "^1.2.0",
+        "ethereum-types": "^1.0.4",
         "ethers": "3.0.22",
         "lodash": "^4.17.5"
     },