diff --git a/TODO b/TODO
index 932c479..4ead455 100644
--- a/TODO
+++ b/TODO
@@ -52,6 +52,12 @@ euscan
 euscanwww
 ---------
 
+<<<<<<< Updated upstream
+=======
+- Really fix mails
+- Add an /about/config page that describe the current config (overlays, stuff in make.conf, euscan default settings, etc..)
+- Create a rss for "scan world" + packages in GET
+>>>>>>> Stashed changes
 - Always keep in db all found versions (when using an API only?). But don't display them if older than current packaged version, except maybe in the "upstream_version" column.
 
 ### packages