diff --git a/mkdocs.yml b/mkdocs.yml
index 6cdb663..ef2083f 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -60,11 +60,8 @@ nav:
     - Troubleshooting: app_troubleshooting.md
 
   - Release Notes:
-<<<<<<< HEAD
-    - March 25, 2026: release-notes/260325.md
-=======
     - March 31, 2026: release-notes/260331.md
->>>>>>> e540a4c (Added release notes)
+    - March 25, 2026: release-notes/260325.md
     - March 20, 2026: release-notes/260320.md
     - March 17, 2026: release-notes/260317.md
     - March 8, 2026: release-notes/260308.md