diff --git a/Doc/sphinx/libmml/intro.rst b/Doc/sphinx/libmml/intro.rst
index 2828323..2a8d5a7 100644
--- a/Doc/sphinx/libmml/intro.rst
+++ b/Doc/sphinx/libmml/intro.rst
@@ -59,8 +59,6 @@ write - again - their own wrapper around libMML. This is what is being done with
 *pyMML*, the python libMML wrapper. It is still as much in development as libMML
 is, but the functionality exposed by libMML is succesfully used.
 
-<<<<<<< HEAD
-=======
 As of writing the pyMML usage looks like this, the passing around of a client
 may be removed in a later stage, or at least have it's behaviour changed.
 
@@ -100,4 +98,3 @@ may be removed in a later stage, or at least have it's behaviour changed.
     print m.getPos()
 
     del DLL
->>>>>>> master