diff --git a/conductor/tracks.md b/conductor/tracks.md
index 8e99eb01f..6ee7e7968 100644
--- a/conductor/tracks.md
+++ b/conductor/tracks.md
@@ -1,6 +1,4 @@
 # Tracks Registry
-<<<<<<< 176990-guards-for-pr
-=======
 
 ---
 
@@ -12,4 +10,3 @@
 - [~] **Track: Build a Merge Queue Dashboard**
 *Link: [./tracks/merge_queue_dashboard_20260205/](./tracks/merge_queue_dashboard_20260205/)*
 
->>>>>>> main