diff --git a/.gitignore b/.gitignore
index 09cd2b1..8161ac4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,7 @@
+<<<<<<< HEAD
+=======
+# ---> Python
+>>>>>>> b7add7334e2d55bda3bce941f6bb4424ecfdd44a
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
@@ -20,6 +24,10 @@ parts/
 sdist/
 var/
 wheels/
+<<<<<<< HEAD
+=======
+share/python-wheels/
+>>>>>>> b7add7334e2d55bda3bce941f6bb4424ecfdd44a
 *.egg-info/
 .installed.cfg
 *.egg
@@ -45,8 +53,15 @@ htmlcov/
 nosetests.xml
 coverage.xml
 *.cover
+<<<<<<< HEAD
 .hypothesis/
 .pytest_cache/
+=======
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+>>>>>>> b7add7334e2d55bda3bce941f6bb4424ecfdd44a
 
 # Translations
 *.mo
@@ -56,6 +71,10 @@ coverage.xml
 *.log
 local_settings.py
 db.sqlite3
+<<<<<<< HEAD
+=======
+db.sqlite3-journal
+>>>>>>> b7add7334e2d55bda3bce941f6bb4424ecfdd44a
 
 # Flask stuff:
 instance/
@@ -68,6 +87,10 @@ instance/
 docs/_build/
 
 # PyBuilder
+<<<<<<< HEAD
+=======
+.pybuilder/
+>>>>>>> b7add7334e2d55bda3bce941f6bb4424ecfdd44a
 target/
 
 # Jupyter Notebook
@@ -78,10 +101,53 @@ profile_default/
 ipython_config.py
 
 # pyenv
+<<<<<<< HEAD
 .python-version
 
 # celery beat schedule file
 celerybeat-schedule
+=======
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# UV
+#   Similar to Pipfile.lock, it is generally recommended to include uv.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#uv.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+#poetry.lock
+
+# pdm
+#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
+#pdm.lock
+#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
+#   in version control.
+#   https://pdm.fming.dev/latest/usage/project/#working-with-version-control
+.pdm.toml
+.pdm-python
+.pdm-build/
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+>>>>>>> b7add7334e2d55bda3bce941f6bb4424ecfdd44a
 
 # SageMath parsed files
 *.sage.py
@@ -113,6 +179,7 @@ dmypy.json
 # Pyre type checker
 .pyre/
 
+<<<<<<< HEAD
 # uv
 .uv/
 
@@ -126,3 +193,18 @@ dmypy.json
 # OS
 .DS_Store
 Thumbs.db
+=======
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# PyCharm
+#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+#.idea/
+
+>>>>>>> b7add7334e2d55bda3bce941f6bb4424ecfdd44a
diff --git a/LICENSE b/LICENSE
index b893e9a..28601db 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,6 @@
 MIT License
 
+<<<<<<< HEAD
 Copyright (c) 2024 MCP Mailu Server Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -19,3 +20,12 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+=======
+Copyright (c) 2025 rsp2k
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+>>>>>>> b7add7334e2d55bda3bce941f6bb4424ecfdd44a
diff --git a/README.md b/README.md
index 355a19e..7161c83 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # MCP Mailu Server
 
 A FastMCP server for integrating with Mailu email server administration using the official Mailu REST API.
@@ -281,3 +282,8 @@ The server exposes the complete Mailu API. For detailed parameter information, r
 ## License
 
 This project is licensed under the MIT License.
+=======
+# mcp-mailu
+
+FastMCP server for Mailu email server API integration - Automatically converts the entire Mailu REST API into MCP tools and resources for AI assistant integration
+>>>>>>> b7add7334e2d55bda3bce941f6bb4424ecfdd44a