Clean up merge conflict markers

Author: aimen-djari

README.md

@@ -172,12 +172,9 @@ for input parameters:
 - Add link to the new explorer feature Asset_Types in the guide =>
   `handle-schemas-dataset-types`
 - Add link to remix for deploying whitelist
-<<<<<<< HEAD
 - complete `use-iapp` section
-- Maybe split input and output in two diff sub section in build your iapp guide
-=======
+- # Maybe split input and output in two diff sub section in build your iapp guide
 - SGX vs TDX need review
->>>>>>> origin/main
 - Explorer l'intégration de codeSpace
 - Add a Development workflow section (1 - ProtectData, 2- ...)
 - Update context7 when doc will be deployed (Martin)
@@ -196,10 +193,7 @@ for input parameters:
 - Give recap of Workerpool address fo chains
 - Talk about ENS on Bellecour(it's not supported on arbitrum)
 - Rework Advanced iApp building guides. (from "old" protocol doc)
-<<<<<<< HEAD
 - Talk about encrypting results in use-iapp
-- Refactor "advanced" section in build-iapp
-=======
+- # Refactor "advanced" section in build-iapp
 - Rework src\get-started\protocol\iexec-doracle.md (transfer to guide or
   rewrite)
->>>>>>> origin/main

src/references/iapp-generator.md

@@ -61,17 +61,10 @@ Once you've built your first iApp, level up with these practical guides:
 
 Ready for production? Dive into specialized topics:
 
-<<<<<<< HEAD
 - **[Build Intel TDX App (Experimental)](/guides/build-iapp/advanced/create-your-first-tdx-app)** -
   Next-gen TEE with traditional deployment and iApp Generator technology
 - **[Complete Guides Overview](/guides/build-iapp/)** - All development guides
   in one place
-=======
-- **[Using TDX (Experimental)](/guides/build-iapp/using-tdx)** - Next-gen TEE
-  technology
-- **[Complete Guides Overview](/guides/build-iapp/build-&-deploy)** - All
-  development guides in one place
->>>>>>> origin/main
 
 ## Why Choose iApp Generator?