Fix rebase

embark-ui/src/reducers/index.js

@@ -87,6 +87,7 @@ function entities(state = entitiesDefaultState, action) {
 }
 
 function errorMessage(state = null, action) {
+  return action.error || state;
 }
 
 function loading(_state = false, action) {

embark-ui/src/routes.js

@@ -2,6 +2,7 @@ import React from 'react';
 import {Route, Switch} from 'react-router-dom';
 
 import HomeContainer from './containers/HomeContainer';
+import AccountsContainer from './containers/AccountsContainer';
 import ContractsContainer from './containers/ContractsContainer';
 import NoMatch from './components/NoMatch';
 import ExplorerLayout from './components/ExplorerLayout';