Merge remote changes and apply Docker configuration

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
 ```

README.md

@@ -77,6 +77,8 @@ docker compose down
 
 El servidor MCP estará disponible en `http://localhost:3001`.
 
+=======
+
 ## Testing
 
 ```bash