diff --git a/pyproject.toml b/pyproject.toml
index 63225dd..7701a20 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -5,17 +5,11 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "telegram-mcp"
 version = "1.5.0"
-<<<<<<< HEAD
-description = "Telegram MCP (Model Context Protocol) server built using Python, Telethon, and MCP Python SDK"
-readme = "README.md"
-authors = [
-    {name = "chigwell"}
-=======
 description = "Telegram integration for Claude via the Model Context Protocol"
 readme = "README.md"
 authors = [
+    {name = "chigwell"},
     {name = "l1v0n1"}
->>>>>>> 34256575c5ccd1cfa8bf8cf577bfa4fd48429904
 ]
 license = {text = "Apache-2.0"}
 classifiers = [
@@ -25,7 +19,7 @@ classifiers = [
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
-    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.12"
 ]
 requires-python = ">=3.10"
 dependencies = [
@@ -34,14 +28,9 @@ dependencies = [
     "mcp[cli]>=1.4.1",
     "nest-asyncio>=1.6.0",
     "python-dotenv>=1.1.0",
-    "telethon>=1.39.0",
+    "telethon>=1.39.0"
 ]
 
 [project.urls]
-<<<<<<< HEAD
 "Homepage" = "https://github.com/chigwell/telegram-mcp"
-"Bug Tracker" = "https://github.com/chigwell/telegram-mcp/issues"
-=======
-"Homepage" = "https://github.com/l1v0n1/telegram-mcp-server"
-"Bug Tracker" = "https://github.com/l1v0n1/telegram-mcp-server/issues"
->>>>>>> 34256575c5ccd1cfa8bf8cf577bfa4fd48429904
+"Bug Tracker" = "https://github.com/chigwell/telegram-mcp/issues"
\ No newline at end of file