diff --git a/docs/main/team/ourstory.md b/docs/main/team/ourstory.md
index b5dd89e..9c51918 100644
--- a/docs/main/team/ourstory.md
+++ b/docs/main/team/ourstory.md
@@ -28,8 +28,4 @@ The Web 4 ecosystem continues to expand with groundbreaking innovations:
 - **3Router**: Encrypted network connectivity.
 - **3Bot**: Self-healing applications that reduce downtime and improve reliability.
 
-<<<<<<< HEAD
-With $65 million in investments and years of development, ACI has transitioned from a groundbreaking idea to a proven, operational reality. It offers a future where the internet is decentralized, resilient, and truly empowering for people and nations alike.
-=======
 With $65 million in investments and years of development, Web 4 has transitioned from a groundbreaking idea to a proven, operational reality. It offers a future where the internet is decentralized, resilient, and truly empowering for people and nations alike.
->>>>>>> 26c95c2b7a975fc983fdaa81afd5edb27999afe3