diff --git a/README.md b/README.md
index 7161c83..355a19e 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # MCP Mailu Server
 
 A FastMCP server for integrating with Mailu email server administration using the official Mailu REST API.
@@ -282,8 +281,3 @@ 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