diff --git a/.env.example b/.env.example
index dfdfd9d..41cbf8b 100644
--- a/.env.example
+++ b/.env.example
@@ -1,3 +1,10 @@
-TELEGRAM_SESSION_NAME=anon
-TELEGRAM_API_ID=12345678
-TELEGRAM_API_HASH=12345678123456781234567812345678
\ No newline at end of file
+# Your Telegram API credentials from https://my.telegram.org/apps
+TELEGRAM_API_ID=123456
+TELEGRAM_API_HASH=0123456789abcdef0123456789abcdef
+
+# Session name (can be any name you choose)
+TELEGRAM_SESSION_NAME=telegram_session
+
+# Optional: Session string for portable authentication (leave empty if not using)
+# This will be generated by the session_string_generator.py script
+TELEGRAM_SESSION_STRING=
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 81cee07..9a388ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -176,3 +176,15 @@ cython_debug/
 # Telegram session files
 *.session
 *.session-journal
+<<<<<<< HEAD
+=======
+anon.session
+anon.session-journal
+anon_new.session
+anon_new.session-journal
+*.session.sql
+*.session.sql-journal
+
+# Claude Desktop config
+claude_desktop_config.json
+>>>>>>> 34256575c5ccd1cfa8bf8cf577bfa4fd48429904
diff --git a/README.md b/README.md
index c90ee31..12e913b 100644
--- a/README.md
+++ b/README.md
@@ -41,8 +41,8 @@ This MCP server provides a comprehensive suite of tools for seamless Telegram in
 ### 1. Clone the Repository
 
 ```bash
-git clone https://github.com/chigwell/telegram-mcp
-cd telegram-mcp
+git clone https://github.com/l1v0n1/telegram-mcp-server
+cd telegram-mcp-server
 ```
 
 ### 2. Generate Session String
diff --git a/pyproject.toml b/pyproject.toml
index 6a43ddf..63225dd 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -5,10 +5,17 @@ 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 = "l1v0n1"}
+>>>>>>> 34256575c5ccd1cfa8bf8cf577bfa4fd48429904
 ]
 license = {text = "Apache-2.0"}
 classifiers = [
@@ -31,5 +38,10 @@ dependencies = [
 ]
 
 [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
diff --git a/uv.lock b/uv.lock
index febcde1..8301051 100644
--- a/uv.lock
+++ b/uv.lock
@@ -1,6 +1,10 @@
 version = 1
 revision = 1
+<<<<<<< HEAD
 requires-python = ">=3.10"
+=======
+requires-python = ">=3.13"
+>>>>>>> 34256575c5ccd1cfa8bf8cf577bfa4fd48429904
 
 [[package]]
 name = "annotated-types"
@@ -16,10 +20,15 @@ name = "anyio"
 version = "4.9.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
+<<<<<<< HEAD
     { name = "exceptiongroup", marker = "python_full_version < '3.11'" },
     { name = "idna" },
     { name = "sniffio" },
     { name = "typing-extensions", marker = "python_full_version < '3.13'" },
+=======
+    { name = "idna" },
+    { name = "sniffio" },
+>>>>>>> 34256575c5ccd1cfa8bf8cf577bfa4fd48429904
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/95/7d/4c1bd541d4dffa1b52bd83fb8527089e097a106fc90b467a7313b105f840/anyio-4.9.0.tar.gz", hash = "sha256:673c0c244e15788651a4ff38710fea9675823028a6f08a5eda409e0c9840a028", size = 190949 }
 wheels = [
@@ -68,6 +77,7 @@ wheels = [
 ]
 
 [[package]]
+<<<<<<< HEAD
 name = "exceptiongroup"
 version = "1.2.2"
 source = { registry = "https://pypi.org/simple" }
@@ -77,6 +87,8 @@ wheels = [
 ]
 
 [[package]]
+=======
+>>>>>>> 34256575c5ccd1cfa8bf8cf577bfa4fd48429904
 name = "h11"
 version = "0.14.0"
 source = { registry = "https://pypi.org/simple" }
@@ -225,6 +237,7 @@ dependencies = [
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/b9/05/91ce14dfd5a3a99555fce436318cc0fd1f08c4daa32b3248ad63669ea8b4/pydantic_core-2.33.0.tar.gz", hash = "sha256:40eb8af662ba409c3cbf4a8150ad32ae73514cd7cb1f1a2113af39763dd616b3", size = 434080 }
 wheels = [
+<<<<<<< HEAD
     { url = "https://files.pythonhosted.org/packages/29/43/0649ad07e66b36a3fb21442b425bd0348ac162c5e686b36471f363201535/pydantic_core-2.33.0-cp310-cp310-macosx_10_12_x86_64.whl", hash = "sha256:71dffba8fe9ddff628c68f3abd845e91b028361d43c5f8e7b3f8b91d7d85413e", size = 2042968 },
     { url = "https://files.pythonhosted.org/packages/a0/a6/975fea4774a459e495cb4be288efd8b041ac756a0a763f0b976d0861334b/pydantic_core-2.33.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:abaeec1be6ed535a5d7ffc2e6c390083c425832b20efd621562fbb5bff6dc518", size = 1860347 },
     { url = "https://files.pythonhosted.org/packages/aa/49/7858dadad305101a077ec4d0c606b6425a2b134ea8d858458a6d287fd871/pydantic_core-2.33.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:759871f00e26ad3709efc773ac37b4d571de065f9dfb1778012908bcc36b3a73", size = 1910060 },
@@ -266,6 +279,8 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/e8/27/be7571e215ac8d321712f2433c445b03dbcd645366a18f67b334df8912bc/pydantic_core-2.33.0-cp312-cp312-win32.whl", hash = "sha256:918f2013d7eadea1d88d1a35fd4a1e16aaf90343eb446f91cb091ce7f9b431a2", size = 1908353 },
     { url = "https://files.pythonhosted.org/packages/be/3a/be78f28732f93128bd0e3944bdd4b3970b389a1fbd44907c97291c8dcdec/pydantic_core-2.33.0-cp312-cp312-win_amd64.whl", hash = "sha256:aec79acc183865bad120b0190afac467c20b15289050648b876b07777e67ea48", size = 1955956 },
     { url = "https://files.pythonhosted.org/packages/21/26/b8911ac74faa994694b76ee6a22875cc7a4abea3c381fdba4edc6c6bef84/pydantic_core-2.33.0-cp312-cp312-win_arm64.whl", hash = "sha256:5461934e895968655225dfa8b3be79e7e927e95d4bd6c2d40edd2fa7052e71b6", size = 1903259 },
+=======
+>>>>>>> 34256575c5ccd1cfa8bf8cf577bfa4fd48429904
     { url = "https://files.pythonhosted.org/packages/79/20/de2ad03ce8f5b3accf2196ea9b44f31b0cd16ac6e8cfc6b21976ed45ec35/pydantic_core-2.33.0-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:f00e8b59e1fc8f09d05594aa7d2b726f1b277ca6155fc84c0396db1b373c4555", size = 2032214 },
     { url = "https://files.pythonhosted.org/packages/f9/af/6817dfda9aac4958d8b516cbb94af507eb171c997ea66453d4d162ae8948/pydantic_core-2.33.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:1a73be93ecef45786d7d95b0c5e9b294faf35629d03d5b145b09b81258c7cd6d", size = 1852338 },
     { url = "https://files.pythonhosted.org/packages/44/f3/49193a312d9c49314f2b953fb55740b7c530710977cabe7183b8ef111b7f/pydantic_core-2.33.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ff48a55be9da6930254565ff5238d71d5e9cd8c5487a191cb85df3bdb8c77365", size = 1896913 },
@@ -283,6 +298,7 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/52/54/295e38769133363d7ec4a5863a4d579f331728c71a6644ff1024ee529315/pydantic_core-2.33.0-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:7b79af799630af263eca9ec87db519426d8c9b3be35016eddad1832bac812d87", size = 1813331 },
     { url = "https://files.pythonhosted.org/packages/4c/9c/0c8ea02db8d682aa1ef48938abae833c1d69bdfa6e5ec13b21734b01ae70/pydantic_core-2.33.0-cp313-cp313t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:eabf946a4739b5237f4f56d77fa6668263bc466d06a8036c055587c130a46f7b", size = 1986653 },
     { url = "https://files.pythonhosted.org/packages/8e/4f/3fb47d6cbc08c7e00f92300e64ba655428c05c56b8ab6723bd290bae6458/pydantic_core-2.33.0-cp313-cp313t-win_amd64.whl", hash = "sha256:8a1d581e8cdbb857b0e0e81df98603376c1a5c34dc5e54039dcc00f043df81e7", size = 1931234 },
+<<<<<<< HEAD
     { url = "https://files.pythonhosted.org/packages/44/77/85e173b715e1a277ce934f28d877d82492df13e564fa68a01c96f36a47ad/pydantic_core-2.33.0-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:e2762c568596332fdab56b07060c8ab8362c56cf2a339ee54e491cd503612c50", size = 2040129 },
     { url = "https://files.pythonhosted.org/packages/33/e7/33da5f8a94bbe2191cfcd15bd6d16ecd113e67da1b8c78d3cc3478112dab/pydantic_core-2.33.0-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:5bf637300ff35d4f59c006fff201c510b2b5e745b07125458a5389af3c0dff8c", size = 1872656 },
     { url = "https://files.pythonhosted.org/packages/b4/7a/9600f222bea840e5b9ba1f17c0acc79b669b24542a78c42c6a10712c0aae/pydantic_core-2.33.0-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:62c151ce3d59ed56ebd7ce9ce5986a409a85db697d25fc232f8e81f195aa39a1", size = 1903731 },
@@ -301,6 +317,8 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/23/8b/b6be91243da44a26558d9c3a9007043b3750334136c6550551e8092d6d96/pydantic_core-2.33.0-pp311-pypy311_pp73-musllinux_1_1_armv7l.whl", hash = "sha256:2c0afd34f928383e3fd25740f2050dbac9d077e7ba5adbaa2227f4d4f3c8da5c", size = 2251618 },
     { url = "https://files.pythonhosted.org/packages/aa/c5/fbcf1977035b834f63eb542e74cd6c807177f383386175b468f0865bcac4/pydantic_core-2.33.0-pp311-pypy311_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:7da333f21cd9df51d5731513a6d39319892947604924ddf2e24a4612975fb936", size = 2255374 },
     { url = "https://files.pythonhosted.org/packages/2f/f8/66f328e411f1c9574b13c2c28ab01f308b53688bbbe6ca8fb981e6cabc42/pydantic_core-2.33.0-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:4b6d77c75a57f041c5ee915ff0b0bb58eabb78728b69ed967bc5b780e8f701b8", size = 2082099 },
+=======
+>>>>>>> 34256575c5ccd1cfa8bf8cf577bfa4fd48429904
 ]
 
 [[package]]
@@ -341,7 +359,10 @@ source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "markdown-it-py" },
     { name = "pygments" },
+<<<<<<< HEAD
     { name = "typing-extensions", marker = "python_full_version < '3.11'" },
+=======
+>>>>>>> 34256575c5ccd1cfa8bf8cf577bfa4fd48429904
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/a1/53/830aa4c3066a8ab0ae9a9955976fb770fe9c6102117c8ec4ab3ea62d89e8/rich-14.0.0.tar.gz", hash = "sha256:82f1bc23a6a21ebca4ae0c45af9bdbc492ed20231dcb63f297d6d1021a9d5725", size = 224078 }
 wheels = [
@@ -405,8 +426,13 @@ wheels = [
 
 [[package]]
 name = "telegram-mcp"
+<<<<<<< HEAD
 version = "1.5.0"
 source = { editable = "." }
+=======
+version = "2025.3.201549"
+source = { virtual = "." }
+>>>>>>> 34256575c5ccd1cfa8bf8cf577bfa4fd48429904
 dependencies = [
     { name = "dotenv" },
     { name = "httpx" },
@@ -482,7 +508,10 @@ source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "click" },
     { name = "h11" },
+<<<<<<< HEAD
     { name = "typing-extensions", marker = "python_full_version < '3.11'" },
+=======
+>>>>>>> 34256575c5ccd1cfa8bf8cf577bfa4fd48429904
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/4b/4d/938bd85e5bf2edeec766267a5015ad969730bb91e31b44021dfe8b22df6c/uvicorn-0.34.0.tar.gz", hash = "sha256:404051050cd7e905de2c9a7e61790943440b3416f49cb409f965d9dcd0fa73e9", size = 76568 }
 wheels = [