diff --git a/AGENTS.md b/AGENTS.md
index d5ee74e..2ff2b01 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -29,6 +29,7 @@ ruff check src/ tests/
 ruff format src/ tests/
 ```
 
+
 ### Docker
 
 ```bash
@@ -82,9 +83,12 @@ TrytonMCP/
 │   ├── test_customer.py
 │   └── test_server.py
 ├── test_rpc.py                # Standalone RPC test script
+<<<<<<< HEAD
 ├── Dockerfile                # Docker container definition
 ├── docker-compose.yaml        # Docker Compose orchestration
 ├── .dockerignore              # Docker build exclusions
+=======
+>>>>>>> 1a9efc93da759d8fc3fce357e9a1d66486ab6995
 ├── pyproject.toml            # Project dependencies
 └── .env.example              # Environment variables template
 ```
diff --git a/README.md b/README.md
index 0e60b0e..c6254a0 100644
--- a/README.md
+++ b/README.md
@@ -77,6 +77,8 @@ docker compose down
 
 El servidor MCP estará disponible en `http://localhost:3001`.
 
+=======
+
 ## Testing
 
 ```bash
@@ -88,4 +90,4 @@ python -m pytest tests/test_server.py -v
 
 # Con coverage
 python -m pytest tests/ --cov=src --cov-report=html
-```
\ No newline at end of file
+```
diff --git a/pyproject.toml b/pyproject.toml
index 0b817f7..cfc01d4 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -29,4 +29,4 @@ dev = [
 ]
 
 [tool.taskipy.tasks]
-start = "fastmcp run ./src/tryton_mcp/server.py --transport http --port 3001 --reload" 
+start = "fastmcp run ./src/tryton_mcp/server.py --transport http --port 3001 --reload"