Fix merge conflicts

1 files changed, 3 insertions, 2 deletions

diff --git a/ui/app/select-app.js b/ui/app/select-app.js
index 31fded715..d1565e2fb 100644
--- a/ui/app/select-app.js
+++ b/ui/app/select-app.js
@@ -1,6 +1,6 @@
 const inherits = require('util').inherits
 const Component = require('react').Component
-const connect = require('./metamask-connect')
+const connect = require('react-redux').connect
 const h = require('react-hyperscript')
 const { HashRouter } = require('react-router-dom')
 const App = require('./app')
@@ -8,6 +8,7 @@ const OldApp = require('../../old-ui/app/app')
 const { autoAddToBetaUI } = require('./selectors')
 const { setFeatureFlag, setNetworkEndpoints } = require('./actions')
 const { BETA_UI_NETWORK_TYPE } = require('../../app/scripts/config').enums
+const I18nProvider = require('./i18n-provider')
 
 function mapStateToProps (state) {
   return {
@@ -68,7 +69,7 @@ SelectedApp.prototype.render = function () {
   ? h(HashRouter, {
       hashType: 'noslash',
     }, [
-      h(App),
+      h(I18nProvider, [ h(App) ]),
     ])
   : h(OldApp)
 }