diff --git a/source/3/3.3/3.3.10/pavucontrol.rst b/source/3/3.3/3.3.10/pavucontrol.rst
index c6f9c290..7ad80673 100644
--- a/source/3/3.3/3.3.10/pavucontrol.rst
+++ b/source/3/3.3/3.3.10/pavucontrol.rst
@@ -12,13 +12,8 @@ Description
 
 Screenshot
 ----------
-<<<<<<< HEAD
-  .. image:: pavucontrol.png
-   :width: 80%
-=======
 .. image:: pavucontrol.png
-   :width:80%
->>>>>>> c7910a4c3c469a3d3f93b03984d3a65c755b0f28
+         :width: 80%
  
 Version
 -------
@@ -27,4 +22,3 @@ Version
 How to Launch
 -------------
 To launch pulse audio volume control in the bottom right of the panel there is an icon that looks like a speaker right click and on the menu click sound settings or run pavucontrol from the command line.  
-
diff --git a/source/4/4.2/tweaking_your_desktop.rst b/source/4/4.2/tweaking_your_desktop.rst
index 6df66975..883c643a 100644
--- a/source/4/4.2/tweaking_your_desktop.rst
+++ b/source/4/4.2/tweaking_your_desktop.rst
@@ -7,12 +7,7 @@ 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 2739377f..cb83ff68 100644
--- a/source/4/system_configuration,_manintainece,_and_administration.rst
+++ b/source/4/system_configuration,_manintainece,_and_administration.rst
@@ -6,8 +6,5 @@ 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