diff --git a/src/Endpoints/TLS.php b/src/Endpoints/TLS.php
index cb67298..38f0a46 100644
--- a/src/Endpoints/TLS.php
+++ b/src/Endpoints/TLS.php
@@ -67,7 +67,6 @@ class TLS implements API
 
         return false;
     }
-<<<<<<< HEAD
     public function getHTTPSRedirectStatus($zoneID) {
         $return = $this->adapter->get(
             'zones/' . $zoneID . '/settings/always_use_https'
@@ -122,6 +121,4 @@ class TLS implements API
 
         return false;
     }
-=======
->>>>>>> 4694904b38fdf5f251559a473cecf77a63cf9202
-}
+}
\ No newline at end of file