diff --git a/tests/test_intl.py b/tests/test_intl.py
index a2b4f0e3b..e82d9f3ed 100644
--- a/tests/test_intl.py
+++ b/tests/test_intl.py
@@ -789,7 +789,6 @@ def test_additional_targets_should_be_translated(app, status, warning):
     yield assert_count(expected_expr, result, 1)
 
 
-<<<<<<< HEAD
 @gen_with_intl_app('text', freshenv=True)
 def test_references(app, status, warning):
     app.builder.build_specific([app.srcdir / 'refs.txt'])