Resolve merge conflict.

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## Current Master
 
 - Add support for alternative ENS TLDs (Ethereum Name Service Top-Level Domains).
+- Lower minimum gas price to 0.1 GWEI, now shown as 100 MWEI.
 
 ## 3.11.2 2017-10-21
 

ui/app/components/pending-tx.js

@@ -15,7 +15,7 @@ const addressSummary = util.addressSummary
 const nameForAddress = require('../../lib/contract-namer')
 const BNInput = require('./bn-as-decimal-input')
 
-const MIN_GAS_PRICE_MWEI_BN = new BN(100)
+const MIN_GAS_PRICE_MWEI_BN = new BN('100')
 const MWEI_FACTOR = new BN(1e6)
 const MIN_GAS_PRICE_BN = MIN_GAS_PRICE_MWEI_BN.mul(MWEI_FACTOR)
 const MIN_GAS_LIMIT_BN = new BN(21000)