diff --git a/SUMMARY.md b/SUMMARY.md
index ba10bb1..88a8451 100644
--- a/SUMMARY.md
+++ b/SUMMARY.md
@@ -1,10 +1,6 @@
 ---
 created: 2026-04-02T16:03
-<<<<<<< HEAD
-updated: 2026-04-07T10:48
-=======
 updated: 2026-04-08
->>>>>>> 4dc77d4 (Add troubleshooting article: wget/curl URLs with special characters)
 ---
 * [Home](index.md)
 * [Linux & Sysadmin](01-linux/index.md)