diff --git a/.index b/.index
index de65435..f00ffbe 100644
--- a/.index
+++ b/.index
@@ -27,9 +27,9 @@ past_ssh.md
 bookmarks
 video_watch_list.md
 vcr_dvd_purchase.md
-<<<<<<< HEAD
+
 linux_recording.md
 20260416160225.md
-=======
+
 d11_theme_reqirements.md
->>>>>>> 9ae0555defb14e20bfa54f8d040484e9a462809b
+