diff --git a/phpBB/common.php b/phpBB/common.php
index 4eeadf06da..81f85003d7 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -154,13 +154,8 @@ if( getenv('HTTP_X_FORWARDED_FOR') != '' )
 
 	if ( preg_match("/^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/", getenv('HTTP_X_FORWARDED_FOR'), $ip_list) )
 	{
-<<<<<<< common.php
 		$private_ip = array('/^0\./', '/^127\.0\.0\.1/', '/^192\.168\..*/', '/^172\.16\..*/', '/^10\..*/', '/^224\..*/', '/^240\..*/');
 		$client_ip = preg_replace($private_ip, $client_ip, $ip_list[1]);
-=======
-		$private_ip = array('/^0\./', '/^127\.0\.0\.1/', '/^192\.168\..*/', '/^172\.16\..*/', '/^10.\.*/', '/^224.\.*/', '/^240.\.*/');
-		$client_ip = preg_replace($private_ip, $client_ip, $ip_list[1]);
->>>>>>> 1.74.2.5
 	}
 }
 else