diff --git a/documentation/doxygen/converttonotebook.py b/documentation/doxygen/converttonotebook.py
index 5d0859c3c30d9b6d1eeb7c06b33c04139009a793..47b9dc2a944eadf7257bbe5289afd95a5dc7cade 100644
--- a/documentation/doxygen/converttonotebook.py
+++ b/documentation/doxygen/converttonotebook.py
@@ -188,11 +188,7 @@ def split(text):
     matches = p.findall(text)
 
     helpers=[]
-<<<<<<< HEAD
     main = ""
-=======
-    main = None
->>>>>>> 7b027ae2ff56f2df3fcf95606e838ee781241259
     for match in matches:
         if name in match:
             main = match