diff --git a/source/conf.py b/source/conf.py
index 5af2b034..a24040c9 100644
--- a/source/conf.py
+++ b/source/conf.py
@@ -33,11 +33,8 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'Lubuntu Manual'
-<<<<<<< HEAD
-copyright = u'2016-2020, Lubuntu Team. This work is licensed under a Creative Commons Attribution 4.0 International License'
-=======
 copyright = u'2016-2022, Lubuntu Team. This work is licensed under a Creative Commons Attribution 4.0 International License'
->>>>>>> stable
+
 author = u'Lubuntu Team'
 
 # The version info for the project you're documenting, acts as replacement for