From 7170d183e93efaa9fc192d91df5e47df2cc815c8 Mon Sep 17 00:00:00 2001
From: ryanml <ryanlanese@gmail.com>
Date: Thu, 1 Jul 2021 13:01:33 -0700
Subject: [PATCH] Fix

---
 .../send/send-content/send-gas-row/send-gas-row.component.js  | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ui/pages/send/send-content/send-gas-row/send-gas-row.component.js b/ui/pages/send/send-content/send-gas-row/send-gas-row.component.js
index 4128380d7..b662261bb 100644
--- a/ui/pages/send/send-content/send-gas-row/send-gas-row.component.js
+++ b/ui/pages/send/send-content/send-gas-row/send-gas-row.component.js
@@ -64,10 +64,6 @@ export default class SendGasRow extends Component {
       minimumGasLimit,
     } = this.props;
     const { trackEvent } = this.context;
-<<<<<<< HEAD
-    const gasPriceFetchFailure = isEthGasPrice || noGasPrice;
-=======
->>>>>>> origin/develop
 
     const gasPriceButtonGroup = (
       <div>