diff --git a/doc/sources/installation/installation-linux.rst b/doc/sources/installation/installation-linux.rst
index 50b86ee58..0d7e21ece 100644
--- a/doc/sources/installation/installation-linux.rst
+++ b/doc/sources/installation/installation-linux.rst
@@ -3,18 +3,7 @@
 Installation on Linux
 =====================
 
-<<<<<<< HEAD
 Using software packages
-=======
-Pre-built Packages
-~~~~~~~~~~~~~~~~~~
-Look at our `Downloads <http://kivy.org/#download>`_ Section for pre-built packages for various linux distro's
-
-Prerequisites
--------------
-
-Ubuntu (11.10 or newer)
->>>>>>> 2c74d04b0dd963f5a67fb8805cefa97c41709417
 ~~~~~~~~~~~~~~~~~~~~~~~
 
 Ubuntu
@@ -154,13 +143,8 @@ OpenSuse
     $ sudo pip install pygments
 
 
-<<<<<<< HEAD
-Mageia (1 and 2(cauldron))
---------------------------
-=======
 Mageia 1 onwards
-~~~~~~~~~~~~~~~~
->>>>>>> 2c74d04b0dd963f5a67fb8805cefa97c41709417
+----------------
 
 ::