diff --git a/registry.yaml b/registry.yaml
index f13a6b7e85..099ad1900e 100644
--- a/registry.yaml
+++ b/registry.yaml
@@ -15,7 +15,7 @@
     - functions
     - responses
     - mutli-agent-collaboration
-=======
+
 - title: o3/o4-mini Function Calling Guide
   path: examples/o-series/o3o4-mini_prompting_guide.ipynb
   date: 2025-05-26
@@ -26,7 +26,6 @@
     - functions
     - responses
     - reasoning
->>>>>>> origin/main
 
 - title: Exploring Model Graders for Reinforcement Fine-Tuning
   path: examples/Reinforcement_Fine_Tuning.ipynb