Fix for lint err

ui/app/account-detail.js

@@ -130,13 +130,13 @@ AccountDetailScreen.prototype.render = function () {
           h('img.cursor-pointer.color-orange', {
             src: 'images/key-32.png',
             onClick: () => this.requestAccountExport(selected),
-            style:{
-              margin: "0px 5px",
-              width: "20px",
-              height: "20px",
-              position: "relative",
-              top: "3px",
-              right: "4px",
+            style: {
+              margin: '0px 5px',
+              width: '20px',
+              height: '20px',
+              position: 'relative',
+              top: '3px',
+              right: '4px',
             },
           }),
 

ui/app/accounts/account-panel.js

@@ -67,12 +67,6 @@ NewComponent.prototype.render = function () {
             event.preventDefault()
             copyToClipboard(ethUtil.toChecksumAddress(identity.address))
           },
-<<<<<<< HEAD
-          style:{
-            margin: '0px 5px',
-          },
-=======
->>>>>>> master
         }),
       ]),
     ])