From bb844caa48e876ff44a212ca337704e101014b75 Mon Sep 17 00:00:00 2001
From: Iuri Matias <iuri.matias@gmail.com>
Date: Tue, 7 Aug 2018 17:43:15 -0400
Subject: [PATCH] fix merge issues

---
 embark-ui/src/reducers/index.js | 4 +---
 embark-ui/src/routes.js         | 1 -
 embark-ui/src/sagas/index.js    | 4 ++--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/embark-ui/src/reducers/index.js b/embark-ui/src/reducers/index.js
index 87106677..8380dfbe 100644
--- a/embark-ui/src/reducers/index.js
+++ b/embark-ui/src/reducers/index.js
@@ -16,9 +16,7 @@ const rootReducer = combineReducers({
   contractProfile: contractProfileReducer,
   blocks: blocksReducer,
   transactions: transactionsReducer,
-  commands: commandsReducer,
-  contracts: contractsReducer,
-  contract: contractReducer
+  commands: commandsReducer
 });
 
 export default rootReducer;
diff --git a/embark-ui/src/routes.js b/embark-ui/src/routes.js
index 1066dfe9..8cba97f2 100644
--- a/embark-ui/src/routes.js
+++ b/embark-ui/src/routes.js
@@ -16,7 +16,6 @@ const routes = (
       <Route path="/embark/explorer/" component={ExplorerLayout} />
       <Route path="/embark/processes/" component={ProcessesLayout} />
       <Route path="/embark/explorer/accounts" component={AccountsContainer} />
-      <Route path="/embark/processes" component={ProcessesContainer} />
       <Route path="/embark/contracts/:contractName" component={ContractLayout} />
       <Route path="/embark/contracts" component={ContractsContainer} />
       <Route component={NoMatch} />
diff --git a/embark-ui/src/sagas/index.js b/embark-ui/src/sagas/index.js
index 950905d6..04ad9d18 100644
--- a/embark-ui/src/sagas/index.js
+++ b/embark-ui/src/sagas/index.js
@@ -154,9 +154,9 @@ export default function *root() {
     fork(watchFetchProcessLogs),
     fork(watchListenToProcessLogs),
     fork(watchFetchBlock),
-    fork(watchFetchTransactions)
+    fork(watchFetchTransactions),
     fork(watchFetchTransaction),
-    fork(watchPostCommand)
+    fork(watchPostCommand),
     fork(watchFetchBlocks),
     fork(watchFetchContracts),
     fork(watchFetchContract),