diff --git a/recentf b/recentf
index 78448b9c..300c727a 100644
--- a/recentf
+++ b/recentf
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 ;;; Automatically generated by ‘recentf’ on Wed Aug 21 11:42:22 2024.
+=======
+;;; Automatically generated by ‘recentf’ on Mon Aug 26 09:38:22 2024.
+>>>>>>> 17bd96f3 (idk)
 
 (setq recentf-list
       '(