Update two comments

Author: amontoison

src/coloring.jl

@@ -638,11 +638,7 @@ function postprocess!(
         # Process the trivial trees (if any)
         if nb_trivial_trees > 0
             for k in 1:nt
-<<<<<<< HEAD
                 # Position of the first edge in the tree
-=======
-                # Starting index of the first edge in the tree
->>>>>>> 3805a9f (Replace num_edges_per_tree by tree_edge_indices in TreeSet)
                 first = tree_edge_indices[k]
 
                 # Total number of edges in the tree