diff --git a/docs/source/_static/tfscript-logo.png b/docs/source/_static/tfscript-logo.png
new file mode 100644
index 0000000..84da037
Binary files /dev/null and b/docs/source/_static/tfscript-logo.png differ
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 41448ce..fd9570e 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -25,6 +25,10 @@ html_theme_options = {
     'description'      : "Managing and simplifying TF2 scripts.",
     'fixed_sidebar'    : True,
     'show_powered_by'  : False,
+<<<<<<< Updated upstream
+=======
+    'logo'             : 'tfscript-logo.png',
+>>>>>>> Stashed changes
 }
 
 import os