removed conflict markers and fixed syntax

Signed-off-by: NAYANA.R <nayana.r7813@gmail.com>

Author: Nayana-R-Gowda

tests/unit/mcpgateway/test_admin.py

@@ -19699,8 +19699,7 @@ async def test_create_grpc_service_allows_public_when_flag_false_no_team_id(self
         result = await admin_create_grpc_service(service, mock_request, mock_db, user={"email": "u@e.com", "db": mock_db})
         assert result.status_code == 201
 
-
-<<<<<<< HEAD
+#
 # ---------------------------------------------------------------------------
 # include_public parameter — team isolation with public overlay (#3411)
 # ---------------------------------------------------------------------------
@@ -20831,12 +20830,11 @@ async def test_admin_list_teams_forwards_search_query(self, monkeypatch, mock_ad
             call_kwargs = mock_team_service.list_teams.call_args[1]
             assert call_kwargs["search_query"] == "nomatch"
             assert call_kwargs["personal_owner_email"] == "admin@example.com"
-=======
+
 def test_ui_base_path_returns_settings_value():
     """Test _ui_base_path() returns the configured value from settings."""
     from mcpgateway.admin import _ui_base_path
     from mcpgateway.config import settings
 
     result = _ui_base_path()
     assert result == settings.mcpgateway_ui_base_path
->>>>>>> 81b711003 (coverage fix)