merge

Author: Joshua Croft

pages/guides/agents/intermediate/agent-functions.mdx

@@ -21,13 +21,8 @@ Make sure you have read the following resources before going on with this guide:
     - [Quick Start Guide for uAgents Framework ↗️](/guides/agents/quickstart)
     - [Creating your first Agent ↗️](/guides/agents/getting-started/create-a-uagent)
     - [Agent Handlers ↗️](/guides/agents/intermediate/handlers)
-<<<<<<< HEAD
     - [Using agents storage function ↗️](/guides/agents/intermediate/storage-function)
     - [Almanac contract ↗️](/references/contracts/uagents-almanac/almanac-overview)
-=======
-    - [Using Agents storage function ↗️](/guides/agents/intermediate/storage-function)
-    - [Almanac contract ↗️](/concepts/fetch-network/almanac)
->>>>>>> origin/main
     - [Register in Almanac ↗️](/guides/agents/register-in-almanac)
     - [Agents protocols ↗️](/guides/agents/intermediate/protocols)
     - [Exchange protocol ↗️](/references/uagents/uagents-protocols/exchange-protocol)

pages/guides/agents/intermediate/bureau.mdx

@@ -15,25 +15,16 @@ Make sure you have read the following resources before going on with this guide:
     - [Quick Start Guide for uAgents Framework ↗️](/guides/agents/quickstart)
     - [Creating your first agent ↗️](/guides/agents/getting-started/create-a-uagent)
     - [Agents address ↗️](/guides/agents/getting-started/getting-uagent-address)
-<<<<<<< HEAD
     - [Almanac contract ↗️](/references/contracts/uagents-almanac/almanac-overview)
-=======
     - [Agent Handlers ↗️](/guides/agents/intermediate/handlers)
-    - [Almanac contract ↗️](/concepts/fetch-network/almanac)
->>>>>>> origin/main
     - [Register in Almanac ↗️](/guides/agents/register-in-almanac)
 
 ## Imports needed
 
     - [uAgents ↗️](https://pypi.org/project/uagents/)
 
-<<<<<<< HEAD
-## Bureau Walk through
 
-This walk through will guide you through the process of setting up and running agents using the Bureau, demonstrating its key functionalities, including agent management, message handling, and external communication via endpoints.
-=======
-## Walk-through
->>>>>>> origin/main
+## Bureau Walk through
 
 This walk-through will guide you through the process of setting up and running Agents using the Bureau, demonstrating its key functionalities, including agent management, message handling, and external communication via endpoints.