diff --git a/phpBB/includes/acp/acp_search.php b/phpBB/includes/acp/acp_search.php
index 82d9b021fe..5ae9f363f0 100644
--- a/phpBB/includes/acp/acp_search.php
+++ b/phpBB/includes/acp/acp_search.php
@@ -596,7 +596,7 @@ class acp_search
 	*/
 	function init_search($type, &$search, &$error)
 	{
-		global $phpbb_root_path, $phpEx, $user;
+		global $phpbb_root_path, $phpEx, $user, $config, $db;
 
 		if (!class_exists($type) || !method_exists($type, 'keyword_search'))
 		{
@@ -605,7 +605,7 @@ class acp_search
 		}
 
 		$error = false;
-		$search = new $type($error);
+		$search = new $type($error, $phpbb_root_path, $phpEx, $config, $db, $user);
 
 		return $error;
 	}
diff --git a/phpBB/includes/search/fulltext_native.php b/phpBB/includes/search/fulltext_native.php
index b9818d7919..a470a92458 100644
--- a/phpBB/includes/search/fulltext_native.php
+++ b/phpBB/includes/search/fulltext_native.php
@@ -342,11 +342,7 @@ class phpbb_search_fulltext_native extends phpbb_search_base
 				// throw an error if we shall not ignore unexistant words
 				else if (!$ignore_no_id && sizeof($non_common_words))
 				{
-<<<<<<< HEAD
 					trigger_error(sprintf($user->lang['WORDS_IN_NO_POST'], implode($user->lang['COMMA_SEPARATOR'], $non_common_words)));
-=======
-					trigger_error(sprintf($this->user->lang['WORDS_IN_NO_POST'], implode(', ', $non_common_words)));
->>>>>>> 1ee5f46... [ticket/11011] remove global keyword in native search
 				}
 				unset($non_common_words);
 			}
diff --git a/phpBB/search.php b/phpBB/search.php
index efbf2f4dfe..68946e2a95 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -280,7 +280,7 @@ if ($keywords || $author || $author_id || $search_id || $submit)
 	}
 	// We do some additional checks in the module to ensure it can actually be utilised
 	$error = false;
-	$search = new $search_type($error);
+	$search = new $search_type($error, $phpbb_root_path, $phpEx, $config, $db, $user);
 
 	if ($error)
 	{