diff --git a/context_processors.py b/context_processors.py
index cd9907c..fbbebf7 100644
--- a/context_processors.py
+++ b/context_processors.py
@@ -15,7 +15,6 @@
         #querry the Domain object
         try:
             c = Client('http://localhost:8001/3.0', API_USER, API_PASS)
-<<<<<<< TREE
             try:            
                 d = c.get_domain(None,web_host)
                 #workaround LP:802971
@@ -28,19 +27,6 @@
                 message = str(e.code) + _(" - Accesing from an unregistered Domain - showing all lists")
         except AttributeError, e:
             message="REST API not found / Offline"
-=======
-            d = c.get_domain(None,web_host)
-            raise Exception(d)#debug
-            #workaround LP:802971
-            domainname= d.email_host
-
-            for list in c.lists:
-                if list.host_name == domainname:
-                    domain_lists.append(list)
-        except HTTPError, e:
-            domain_lists = c.lists
-            message = str(e.code) + _(" - Accesing from an unregistered Domain - showing all lists")
->>>>>>> MERGE-SOURCE
 
     #return a Dict with the key used in templates
     return {"lists":domain_lists, "message":message}