diff --git a/python_aternos/atclient.py b/python_aternos/atclient.py
index 91f041c..8a0eb34 100644
--- a/python_aternos/atclient.py
+++ b/python_aternos/atclient.py
@@ -193,11 +193,7 @@ class Client:
         serverstree = lxml.html.fromstring(serverspage.content)
 
         servers = serverstree.xpath(
-<<<<<<< HEAD
-            '/html/body/div[1]/main/div[3]/section/div[1]/div[2]/div'
-=======
             '//div[@class="servers"]/div'
->>>>>>> f731f1b (Bugfixes in Client, Cloudflare page example)
             '/div[@class="server-body"]/@data-id'
         )
         self.refresh_servers(servers)
@@ -235,7 +231,7 @@ class Client:
         """
 
         return AternosServer(servid, self.atconn)
-    
+
     def logout(self) -> None:
 
         """Logouts from Aternos account"""