diff --git a/src/sage/matrix/seymour_decomposition.pyx b/src/sage/matrix/seymour_decomposition.pyx
index d8aa1bf2c1e..b3f163f75c0 100644
--- a/src/sage/matrix/seymour_decomposition.pyx
+++ b/src/sage/matrix/seymour_decomposition.pyx
@@ -499,11 +499,19 @@ cdef class SpecialLeafNode(DecompositionNode):
 
     def _repr_(self):
         return f'Isomorphic to a minor of {self._matroid()}'
+<<<<<<< HEAD
+=======
+
+>>>>>>> cmr
     def rep_matrix(self):
         r"""
         WIP
         """
         assert NotImplementedError
+<<<<<<< HEAD
+=======
+
+>>>>>>> cmr
         cdef int representation_matrix
         cdef CMR_DEC_TYPE typ = CMRdecIsSpecialLeaf(self._dec, &representation_matrix)
         return Matrix_cmr_chr_sparse._from_data(representation_matrix, immutable=False)