diff --git a/docs/source/conf.py b/docs/source/conf.py
index fd9570e..285725a 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -25,10 +25,7 @@ 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