diff --git a/yarp/yarp.c b/yarp/yarp.c
index c425c53c1c..e3199d31ae 100644
--- a/yarp/yarp.c
+++ b/yarp/yarp.c
@@ -6369,6 +6369,7 @@ parser_lex(yp_parser_t *parser) {
 
                                 if (parser->current.end < parser->end) {
                                     lex_mode_push_regexp(parser, lex_mode_incrementor(*parser->current.end), lex_mode_terminator(*parser->current.end));
+<<<<<<< HEAD:yarp/yarp.c
 <<<<<<< HEAD:yarp/yarp.c
                                     yp_newline_list_check_append(&parser->newline_list, parser->current.end);
 =======
@@ -6376,6 +6377,9 @@ parser_lex(yp_parser_t *parser) {
                                         yp_newline_list_append(&parser->newline_list, parser->current.end);
                                     }
 >>>>>>> 0d5d759091 (fix: support newline-terminated regular expressions):src/yarp.c
+=======
+                                    yp_newline_list_check_append(&parser->newline_list, parser->current.end);
+>>>>>>> 149c74291b (prefactor: extract yp_newline_list_check_append):src/yarp.c
                                     parser->current.end++;
                                 }