Correct merge conflict resolution errors.

ui/app/accounts/import/private-key.js

@@ -38,8 +38,6 @@ PrivateKeyImportView.prototype.render = function () {
 
       h('div.new-account-import-form__private-key-password-container', [
 
-        h('span.new-account-import-form__instruction', 'Paste your private key string here:'),
-
         h('input.new-account-import-form__input-password', {
           type: 'password',
           id: 'private-key-box',

ui/app/components/account-menu/index.js

@@ -95,13 +95,6 @@ AccountMenu.prototype.render = function () {
       icon: h('img', { src: 'images/mm-info-icon.svg' }),
       text: t('infoHelp'),
     }),
-    h(Item, {
-      onClick: showConfigPage,
-      icon: h('img', { src: 'images/settings.svg' }),
-      text: t('settings'),
-      icon: h('img.account-menu__item-icon', { src: 'images/mm-info-icon.svg' }),
-      text: t('infoHelp'),
-    }),
     h(Item, {
       onClick: showConfigPage,
       icon: h('img.account-menu__item-icon', { src: 'images/settings.svg' }),