diff --git a/docs/api.rst b/docs/api.rst
index ade4e52..f6009cc 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -31,5 +31,4 @@ Lower-Lower-Level Classes
 .. autoclass:: camelot.core.Table
    :inherited-members:
 
-.. autoclass:: camelot.core.Cell
-   :inherited-members:
\ No newline at end of file
+.. autoclass:: camelot.core.Cell
\ No newline at end of file
diff --git a/docs/conf.py b/docs/conf.py
index ff195c8..6eb3b94 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -189,10 +189,17 @@ html_use_smartypants = True
 
 # Custom sidebar templates, maps document names to template names.
 html_sidebars = {
+<<<<<<< HEAD
     'index': ['sidebarintro.html', 'relations.html', 'sourcelink.html',
               'searchbox.html', 'hacks.html'],
     '**': ['sidebarlogo.html', 'localtoc.html', 'relations.html',
            'sourcelink.html', 'searchbox.html', 'hacks.html']
+=======
+    'index': ['sidebarlogo.html', 'relations.html', 'sourcelink.html',
+              'searchbox.html'],
+    '**': ['sidebarlogo.html', 'localtoc.html', 'relations.html',
+           'sourcelink.html', 'searchbox.html']
+>>>>>>> f72e83a1b3e292a7156e7ad5a51b738760c3608c
 }
 
 # Additional templates that should be rendered to pages, maps page names to