diff --git a/rtl/inc/matrix.pp b/rtl/inc/matrix.pp
index 44ae3633de..3efc6a2ee1 100644
--- a/rtl/inc/matrix.pp
+++ b/rtl/inc/matrix.pp
@@ -821,6 +821,3 @@ implementation
 {$i mmatimp.inc}
 
 end.
-<<<<<<< .mine
-=======
->>>>>>> .r41