diff --git a/basics.html b/basics.html
index 37ffb296835c66ca1a213c42b01a0e48de864bad..0ba996fd42120e6c5766778294da979ff7ef83c4 100644
--- a/basics.html
+++ b/basics.html
@@ -618,7 +618,9 @@
 
             notes:
             - collaboration needs remote repositories
-            - by-product of remotes is backup
+            - by-product of remotes is backup: my `~/projects` does not need to
+              be backed up because **every** project is under version control
+              and has a remote
           </section>
 
           <section id="distributed-remotes" data-markdown>
@@ -757,6 +759,8 @@
             notes:
             - hopefully conflicting changes
             - MR status should show that (can not be merged without conflicts)
+            - TODO explain merge or rebase
+            - TODO show both variants from maintainer and contributor
           </section>
         </section>