fix rebase errors

app/components/SimpleEditor/Editor.js

@@ -73,7 +73,7 @@ class Editor extends ProseEditor {
 
     // TODO -- unnecessary // posssibly breaks book builder dnd
     let ContextMenu = this.componentRegistry.get('context-menu') // new what does it do?
-    let Dropzones = this.componentRegistry.get('dropzones') // new what does it do?
+    // let Dropzones = this.componentRegistry.get('dropzones') // new what does it do?
 
     const footerNotes = $$(Notes)
 
@@ -114,12 +114,13 @@ class Editor extends ProseEditor {
     })
     .append(editorWithComments,
       $$(Overlay),
-      $$(ContextMenu),
-      $$(Dropzones))
+      $$(ContextMenu)
+      // $$(Dropzones)
+    )
     .attr('id', 'content-panel')
     .ref('contentPanel')
 
-    var contentPanelWithSplitPane = $$(SplitPane, { sizeA: '75%', splitType: 'vertical' })
+    const contentPanelWithSplitPane = $$(SplitPane, { sizeA: '75%', splitType: 'vertical' })
       .append(
         contentPanel,
         toc
@@ -166,10 +167,10 @@ class Editor extends ProseEditor {
           trackChanges: this.props.trackChanges,
           trackChangesView: this.state.trackChangesView,
           toolGroups: [
+            'text',
+            'document',
             'annotations',
             'default',
-            'document',
-            'text',
             'track-change-enable',
             'track-change-toggle-view'
           ]

app/components/SimpleEditor/config.js

 import {
   BasePackage,
+  // Blockquote,
   CodePackage,
   EmphasisPackage,
   HeadingPackage,
@@ -36,6 +37,7 @@ let config = {
     config.import(BasePackage, {
       noBaseStyles: options.noBaseStyles
     })
+
     config.import(SwitchTextTypePackage)
     config.import(ParagraphPackage)
     config.import(HeadingPackage)
@@ -46,6 +48,8 @@ let config = {
     config.import(CodePackage)
     config.import(PersistencePackage)
 
+    // console.log(Blockquote)
+
     // config.import(CodeblockPackage)
     config.import(CommentPackage)
     config.import(ExtractPackage)

app/components/SimpleEditor/panes/Comments/CommentsProvider.js

@@ -67,7 +67,6 @@ class CommentsProvider extends TocProvider {
 
   // runs when document session is updated
   updateActiveEntry () {
-    console.log('updateActiveEntry')
     const activeEntry = this.getActiveEntry()
     const selectionContainsComments = this.selectionContainsComments()
 

app/components/SimpleEditor/panes/TableOfContents/TableOfContents.js

@@ -29,8 +29,7 @@ class TableOfContents extends Toc {
   }
 
   render ($$) {
-    const provider = this.getProvider()
-    const { book, fragment } = provider.config.props
+    const { book, fragment } = this.props
 
     const tocProvider = this.getProvider()
     const activeEntry = tocProvider.activeEntry