1 files changed, 2 insertions, 12 deletions
diff --git a/ui/app/components/input-number.js b/ui/app/components/input-number.js
index 01f751b69..59c6842ef 100644
--- a/ui/app/components/input-number.js
+++ b/ui/app/components/input-number.js
@@ -2,8 +2,10 @@ const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
 const {
+  addCurrencies,
   conversionGTE,
   conversionLTE,
+  subtractCurrencies,
 } = require('../conversion-util')
 
 module.exports = InputNumber
@@ -49,11 +51,7 @@ InputNumber.prototype.setValue = function (newValue) {
 }
 
 InputNumber.prototype.render = function () {
-<<<<<<< HEAD
   const { unitLabel, step = 1, placeholder, value } = this.props
-=======
-  const { unitLabel, step = 1, placeholder, value = 0, min = -1, max = Infinity } = this.props
->>>>>>> Refactor and redesign confirm transaction views
 
   return h('div.customize-gas-input-wrapper', {}, [
     h('input', {
@@ -69,19 +67,11 @@ InputNumber.prototype.render = function () {
     h('span.gas-tooltip-input-detail', {}, [unitLabel]),
     h('div.gas-tooltip-input-arrows', {}, [
       h('i.fa.fa-angle-up', {
-<<<<<<< HEAD
         onClick: () => this.setValue(addCurrencies(value, step, { toNumericBase: 'dec' })),
       }),
       h('i.fa.fa-angle-down', {
         style: { cursor: 'pointer' },
         onClick: () => this.setValue(subtractCurrencies(value, step, { toNumericBase: 'dec' })),
-=======
-        onClick: () => this.setValue(Math.min(+value + step, max)),
-      }),
-      h('i.fa.fa-angle-down', {
-        style: { cursor: 'pointer' },
-        onClick: () => this.setValue(Math.max(+value - step, min)),
->>>>>>> Refactor and redesign confirm transaction views
       }),
     ]),
   ])