diff --git a/checklog-odoo.cfg b/checklog-odoo.cfg
index 29ef1b984..0b55b7bf6 100644
--- a/checklog-odoo.cfg
+++ b/checklog-odoo.cfg
@@ -1,7 +1,3 @@
 [checklog-odoo]
 ignore=
-<<<<<<< before updating
-    WARNING.*0 failed, 0 error\(s\).*
-=======
     WARNING.* 0 failed, 0 error\(s\).*
->>>>>>> after updating