diff --git a/source/3/3.3/3.3.10/pavucontrol.rst b/source/3/3.3/3.3.10/pavucontrol.rst
index 8a5df167..c6f9c290 100644
--- a/source/3/3.3/3.3.10/pavucontrol.rst
+++ b/source/3/3.3/3.3.10/pavucontrol.rst
@@ -12,8 +12,13 @@ Description
 
 Screenshot
 ----------
+<<<<<<< HEAD
   .. image:: pavucontrol.png
    :width: 80%
+=======
+.. image:: pavucontrol.png
+   :width:80%
+>>>>>>> c7910a4c3c469a3d3f93b03984d3a65c755b0f28
  
 Version
 -------
diff --git a/source/4/4.2/4.2.3/Monitor_settings.rst b/source/4/4.2/4.2.3/Monitor_settings.rst
index 187a524b..2c265379 100644
--- a/source/4/4.2/4.2.3/Monitor_settings.rst
+++ b/source/4/4.2/4.2.3/Monitor_settings.rst
@@ -12,7 +12,11 @@ Monitor settings has for a multiple monitors and the ability to turn on and off
 Screenshot
 ----------
  .. image:: Monitor_settings.png
+<<<<<<< HEAD
       :width:80%
+=======
+     :width:80%
+>>>>>>> c7910a4c3c469a3d3f93b03984d3a65c755b0f28
 
 How to Launch
 -------------
diff --git a/source/4/4.2/tweaking_your_desktop.rst b/source/4/4.2/tweaking_your_desktop.rst
index 4b403b70..6df66975 100644
--- a/source/4/4.2/tweaking_your_desktop.rst
+++ b/source/4/4.2/tweaking_your_desktop.rst
@@ -7,6 +7,12 @@ This chapter contains the list of applications to tweak your Lubuntu desktop.
    :maxdepth: 2
    :titlesonly:
 
+<<<<<<< HEAD
    4.2.1/openbox_configuration_manager.rst
    4.2.2/Customize_Look_and_Feel.rst
    4.2.3/Monitor_settings.rst
+=======
+    4.2.1/openbox_configuration_manager.rst
+    4.2.2/Customize_Look_and_Feel.rst
+    4.2.3/Monitor_settings.rst
+>>>>>>> c7910a4c3c469a3d3f93b03984d3a65c755b0f28
diff --git a/source/4/system_configuration,_manintainece,_and_administration.rst b/source/4/system_configuration,_manintainece,_and_administration.rst
index cb83ff68..2739377f 100644
--- a/source/4/system_configuration,_manintainece,_and_administration.rst
+++ b/source/4/system_configuration,_manintainece,_and_administration.rst
@@ -6,5 +6,8 @@ This chapter will show you how to configure update customize your install of lub
 .. toctree::
   :maxdepth: 2
   :titlesonly:
+<<<<<<< HEAD
 
   4.2/tweaking_your_desktop
+=======
+>>>>>>> c7910a4c3c469a3d3f93b03984d3a65c755b0f28
diff --git a/source/index.rst b/source/index.rst
index b7fff589..4f8cf33c 100644
--- a/source/index.rst
+++ b/source/index.rst
@@ -19,7 +19,7 @@ Contents
 
    1/installing_lubuntu
    3/applications
-   4/System Configuration, Maintenance, and Administration
+   4/system_configuration,_manintainece,_and_administration
 
 Contact Us
 ==========