diff --git a/lib/common.lib.php b/lib/common.lib.php
index 9a8989202..00ae54b39 100644
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@@ -1987,16 +1987,8 @@ function hyphen_hp_number($hp)
 function login_url($url='')
 {
     if (!$url) $url = G4_URL;
-<<<<<<< HEAD
     //$p = parse_url($url);
     //return $url.urldecode(preg_replace("/^".urlencode($p['path'])."/", "", urlencode($_SERVER['REQUEST_URI'])));
-=======
-    /*
-    $p = parse_url($url);
-    echo urlencode($_SERVER['REQUEST_URI']);
-    return $url.urldecode(preg_replace("/^".urlencode($p['path'])."/", "", urlencode($_SERVER['REQUEST_URI'])));
-    */
->>>>>>> g4s
     return $url;
 }