diff --git a/README.md b/README.md
index 8aba7ec6d..4d7bd604b 100644
--- a/README.md
+++ b/README.md
@@ -280,7 +280,6 @@ Authentication is provided by an external `@edr/iamui-common` / `@tria-plc/iamap
 pnpm install
 ```
 
-<<<<<<< HEAD
 ### 3. Environment Configuration
 ```bash
 # Copy environment template
@@ -949,7 +948,6 @@ For technical support or questions:
 ---
 
 **Built with ❤️ for Ethio-Djibouti Railway**
-=======
 ### Start local databases
 
 ```bash
@@ -1022,4 +1020,3 @@ pnpm dev:passenger     # passenger API + portal + backoffice
 - **One DB per domain** — no cross-database joins.
 
 See [`CLAUDE.md`](./CLAUDE.md) for the deeper developer guide used during AI-assisted contributions.
->>>>>>> b9cfce70fe17b5066ae5320cfcc595bf3c253467