diff --git a/tests/parser/test_parse_navigate.py b/tests/parser/test_parse_navigate.py
index 8c76199f4..1771dbeba 100644
--- a/tests/parser/test_parse_navigate.py
+++ b/tests/parser/test_parse_navigate.py
@@ -7,11 +7,7 @@ import pytest
 
 @pytest.fixture
 def sun_text():
-<<<<<<< HEAD:tests/parser/test_parse_navigate.py
-    with codecs.open(path.join(path.dirname(__file__), '..', 'sun.txt'), 'r', 'utf8') as file_:
-=======
     with io.open(path.join(path.dirname(__file__), 'sun.txt'), 'r', encoding='utf8') as file_:
->>>>>>> 8caedba42a5255b9996533a732e17eee3f20a2dd:tests/test_parse_navigate.py
         text = file_.read()
     return text