fix merge conflicts

.yo-rc.json

@@ -1,3 +0,0 @@
-{
-  "generator-mocha": {}
-}

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## Current Develop Branch
 
 - [#4606](https://github.com/MetaMask/metamask-extension/pull/4606): Add new metamask_watchAsset method.
+- [#5189](https://github.com/MetaMask/metamask-extension/pull/5189): Fix bug where Ropsten loading message is shown when connecting to Kovan.
 
 ## 4.9.3 Wed Aug 15 2018
 

package-lock.json

@@ -7658,9 +7658,15 @@
       }
     },
     "enzyme-adapter-utils": {
+<<<<<<< HEAD
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/enzyme-adapter-utils/-/enzyme-adapter-utils-1.7.0.tgz",
       "integrity": "sha512-K5FVpGxMlakvvWS6TkwogAzvMRE4pgve6grPzCuraVHRBzgrmeasGDF1CS2rQc7uKo7OF0FQZxaQm8oJAKXFVw==",
+=======
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/enzyme-adapter-utils/-/enzyme-adapter-utils-1.8.0.tgz",
+      "integrity": "sha512-K9U2RGr1pvWPGEAIRQRVH4UdlqzpfLsKonuHyAK6lxu46yfGsMDVlO3+YvQwQpVjVw8eviEVIOmlFAnMbIhv/w==",
+>>>>>>> fdb023381be323bd3198d5e102447e6591e7e73e
       "dev": true,
       "requires": {
         "function.prototype.name": "^1.1.0",

ui/app/app.js

@@ -188,7 +188,7 @@ class App extends Component {
     } else if (providerName === 'ropsten') {
       name = this.context.t('connectingToRopsten')
     } else if (providerName === 'kovan') {
-      name = this.context.t('connectingToRopsten')
+      name = this.context.t('connectingToKovan')
     } else if (providerName === 'rinkeby') {
       name = this.context.t('connectingToRinkeby')
     } else {