diff --git a/src/time/pyproject.toml b/src/time/pyproject.toml
index b626fc2d..b498a07b 100644
--- a/src/time/pyproject.toml
+++ b/src/time/pyproject.toml
@@ -17,17 +17,10 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
 ]
 dependencies = [
-<<<<<<< HEAD
-    "mcp>=1.0.0",
-    "pydantic>=2.0.0",
-    "tzdata>=2024.2",
-    "tzlocal>=5.3.1"
-=======
     "mcp>=1.23.0",
     "pydantic>=2.0.0",
     "tzdata>=2024.2",
     "tzlocal>=5.3.1",
->>>>>>> origin/main
 ]
 
 [project.scripts]
diff --git a/src/time/src/mcp_server_time/server.py b/src/time/src/mcp_server_time/server.py
index 9873ce17..e10d6b4e 100644
--- a/src/time/src/mcp_server_time/server.py
+++ b/src/time/src/mcp_server_time/server.py
@@ -8,11 +8,7 @@ from tzlocal import get_localzone_name  # ← returns "Europe/Paris", etc.
 
 from mcp.server import Server
 from mcp.server.stdio import stdio_server
-<<<<<<< HEAD
-from mcp.types import Tool, TextContent, ImageContent, EmbeddedResource
-=======
 from mcp.types import Tool, TextContent, ImageContent, EmbeddedResource, ErrorData, INVALID_PARAMS
->>>>>>> origin/main
 from mcp.shared.exceptions import McpError
 
 from pydantic import BaseModel
@@ -58,11 +54,7 @@ def get_zoneinfo(timezone_name: str) -> ZoneInfo:
     try:
         return ZoneInfo(timezone_name)
     except Exception as e:
-<<<<<<< HEAD
-        raise McpError(f"Invalid timezone: {str(e)}")
-=======
         raise McpError(ErrorData(code=INVALID_PARAMS, message=f"Invalid timezone: {str(e)}"))
->>>>>>> origin/main
 
 
 class TimeServer: