Merge branch 'main' of git.ourworld.tf:tfgrid/info_docs_tfgrid4_tech

# Conflicts:
#	docs/main/first_principle_thinking/2_hardware_badly_used.md
#	docs/main/geoaware/solution.md
#	docs/main/introduction.md

docs/main/first_principle_thinking/2_hardware_badly_used.md

@@ -4,7 +4,11 @@ sidebar_position: 6
 hide_title: true
 ---
 
+<<<<<<< HEAD
+# Hardware Is Powerfull
+=======
 # Hardware Is Poweful
+>>>>>>> f008746dae6f2bffedc655509c0c7acd4a6e7190
 
 ![](img/hardware_comparison.png)
 

docs/main/geoaware/solution.md

@@ -13,7 +13,14 @@ hide_title: true
 - [Compare Electricity](../internet_today/compare_electricity.md) - Compares the inefficiency of relying on distant internet infrastructure to the absurdity of using electricity generated on the other side of the world.
 - [Internet Basics](../internet_today/internet_basics.md) - Explains the three fundamental layers of the internet: compute/AI/storage, network, and applications, highlighting current centralization issues.
 - [Centralization Risk](../internet_today/centralization_risk.md) - Details the dangers of relying on centralized infrastructure and services, using real-world examples like the Ukraine conflict.
+<<<<<<< HEAD
+- [The Race For Intelligence](../internet_reinvented/aci.md) - Discusses how AI agents will replace traditional apps within 2 years and the implications of centralized AI development.
 - [GDP Negative Impact](../internet_today/gdp_negative.md) - Reveals how the current internet structure causes economic losses for developing nations, with case studies showing billions in yearly losses.
+- [Internet Protocol Is Broken](../first_principle_thinking/3_internet_risk.md) - Explains why TCP/IP's outdated design is inadequate for modern internet needs and explores RINA as a potential solution.
+- [Painkillers Approach](../first_principle_thinking/1_onion_analogy.md) - Uses an onion analogy to illustrate how adding layers to internet infrastructure masks symptoms rather than solving core problems.
+=======
+- [GDP Negative Impact](../internet_today/gdp_negative.md) - Reveals how the current internet structure causes economic losses for developing nations, with case studies showing billions in yearly losses.
+>>>>>>> f008746dae6f2bffedc655509c0c7acd4a6e7190
 
 
 **The following table shows how the problems as listed above are fixed because of geo awareness.**

docs/main/internet_reinvented/infrastructure.md

@@ -50,7 +50,7 @@ sidebar_position: 5
 
 ---
 
-### **How it All Works Together**
+## **How it All Works Together**
 The system's core components—network, storage, and compute layers—are deeply interconnected, forming an **Unbreakable Cloud Engine**:
 - The **network layer** ensures seamless communication and data transmission across nodes, even under adverse conditions.
 - The **storage layer** safeguards data, enabling ultra-reliable access and scalability to support global demands.