fix Merge conflict.

client/src/connectors/Dashboard.connector.js

@@ -1,6 +1,4 @@
 
-
-
 import { connect } from 'react-redux';
 import t from 'store/types';
 

client/src/connectors/Items.connect.js

@@ -5,6 +5,7 @@ import {
   fetchItems,
   fetchItem,
   deleteItem,
+  submitItem,
 } from 'store/items/items.actions';
 import {
   getResourceViews,
@@ -30,6 +31,7 @@ export const mapStateToProps = (state, props) => {
 export const mapDispatchToProps = (dispatch) => ({
   fetchItems: (query) => dispatch(fetchItems({ query })),
   requestDeleteItem: (id) => dispatch(deleteItem({ id })),
+  requestSubmitItem: (form) => dispatch(submitItem({ form })),
   addBulkActionItem: (id) => dispatch({
     type: t.ITEM_BULK_ACTION_ADD, itemId: id
   }),
@@ -38,4 +40,4 @@ export const mapDispatchToProps = (dispatch) => ({
   }),
 });
 
-export default connect(mapStateToProps, mapDispatchToProps);
+export default connect(mapStateToProps, mapDispatchToProps);