Fix some rebasing conflicts

src/components/Toolbar.jsx

@@ -156,16 +156,19 @@ class Toolbar extends React.Component {
 
   renderToolbarTabs() {
     const title = copy[this.props.language].toolbar.title;
+    const isTags = this.props.tags && (this.props.tags.children > 0);
+
     return (
       <div className="toolbar">
         <div className="toolbar-header"><p>{title}</p></div>
         <div className="toolbar-tabs">
           {/*this.renderToolbarTab(0, 'search')*/}
-          {(this.props.isModeGuided)
-            ? this.renderToolbarNavs()
-            : this.renderToolbarTagRoot()}
+          {this.renderToolbarTab(0, 'Narratives')}
+          {(isTags) ? this.renderToolbarTab(1, 'Explore by tag') : ''}
         </div>
-        {/* {this.renderBottomActions()} */}
+        <ToolbarBottomActions
+          actions={this.props.actions}
+        />
       </div>
     )
   }

src/components/presentational/CardCategory.js

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { capitalizeFirstLetter } from '../../js/data/utilities.js';
+import { capitalizeFirstLetter } from '../../js/utilities.js';
 
 const CardCategory = ({ categoryTitle, categoryLabel, color }) => (
   <div className="card-row card-cell category">