diff --git a/trlc/ast.py b/trlc/ast.py
index 8d8ed0b..2fae7b1 100644
--- a/trlc/ast.py
+++ b/trlc/ast.py
@@ -3088,13 +3088,10 @@ def iter_record_objects_by_section(self):
         """API for users
 
         Retriving information about the section hierarchy for record objects
-<<<<<<< HEAD
-=======
         Inputs: folder with trlc files where trlc files have sections,
         sub sections and record objects
         Output: Information about sections and level of sections,
         record objects and levels of record object
->>>>>>> ce6c48c (Added the Iteration API by Section in toctree)
         """
         for record_object in self.iter_record_objects():
             location = record_object.location.file_name