diff --git a/src/readability_lxml/readability.py b/src/readability_lxml/readability.py
index d6f8365..ab45d24 100755
--- a/src/readability_lxml/readability.py
+++ b/src/readability_lxml/readability.py
@@ -27,7 +27,6 @@ log = logging.getLogger()
REGEXES = {
-<<<<<<< HEAD:src/readability_lxml/readability.py
'unlikelyCandidatesRe': re.compile(
('combx|comment|community|disqus|extra|foot|header|menu|remark|rss|'
'shoutbox|sidebar|sponsor|ad-break|agegate|pagination|pager|popup|'
diff --git a/src/tests/regression.py b/src/tests/regression.py
index 5c6555c..b95505f 100644
--- a/src/tests/regression.py
+++ b/src/tests/regression.py
@@ -17,7 +17,6 @@ import os.path
import re
import sys
import unittest
-import readability.urlfetch
import yaml
from lxml.html import builder as B
diff --git a/src/tests/test_readability.py b/src/tests/test_readability.py
index 2b7655b..1ca9938 100644
--- a/src/tests/test_readability.py
+++ b/src/tests/test_readability.py
@@ -150,7 +150,7 @@ class TestMultiPageHelpers(unittest.TestCase):
def test_find_next_page_url(self):
"""Verify we can find a next page url in the html body"""
html = """
- 2
+ next
"""
from lxml.html import document_fromstring
doc = document_fromstring(html)