diff --git a/tools/check/forbidden_strings_in_code.txt b/tools/check/forbidden_strings_in_code.txt
index 2698429b13..7b869e8cd2 100644
--- a/tools/check/forbidden_strings_in_code.txt
+++ b/tools/check/forbidden_strings_in_code.txt
@@ -32,6 +32,8 @@
 import static
 
 ### Rubbish from merge. Please delete those lines (sometimes in comment)
+<<<<<<<
+>>>>>>>
 
 ### carry return before "}". Please remove empty lines.
 \n\s*\n\s*\}