diff --git a/notes.md b/notes.md
index 2331d9b..6a0d51f 100644
--- a/notes.md
+++ b/notes.md
@@ -1,73 +1,58 @@
 # Notes to the self
 
-<<<<<<< HEAD
-=======
-
-
-
-## Tutorial with Cristina
->>>>>>> 95d346124370c51e5a1eb76b1ffbbfe919f4f010
-
 ## for Jian
 
-- https://mermaid.js.org
-- https://asciiflow.com/
--
+-   https://mermaid.js.org
+-   https://asciiflow.com/
 
 ## Tutorial with Cristina, lecture with Aymeric
 
-- lack of documentation is (not) the only problem
-- documentation as gardening, need for constant maintainance
-<<<<<<< HEAD
-- see refs in the queque
-- look into gemini protocol for documentation
-- garden library network
-- print a small photo receipt roll ior Marloes
-- cultural diffusion vs cultural appropriation
-=======
-- tower of babel of technicalities
->>>>>>> 95d346124370c51e5a1eb76b1ffbbfe919f4f010
+-   lack of documentation is (not) the only problem
+-   documentation as gardening, need for constant maintainance
+-   see refs in the queque
+-   look into gemini protocol for documentation
+-   garden library network
+-   print a small photo receipt roll for Marloes
+-   cultural diffusion vs cultural appropriation
+-   tower of babel of technicalities
 
 ## Aaaaaaaaaaaaaaaaaaaaaaaaaa
 
 For research question: developing and sharing tools is important so mention it
 
-
 ## Cycling along the river
-- notes for thesis: cycling along the river, documentation, learning a new language, esolang, exploring different ways of thinking
 
+-   notes for thesis: cycling along the river, documentation, learning a new language, esolang, exploring different ways of thinking
 
 ## Revision on structure and late night notes
-- new intro
-- two flows
-- (chap 02) from close to the mainframe to telescopic writing
 
-## Bouldering and secrecy
+-   new intro
+-   two flows
+-   (chap 02) from close to the mainframe to telescopic writing
 
-- suckless and bouldering: different levels of documentation
-- documentation as backdoor
---> but for a different target
+## Bouldering and secrecy
 
-- stealth
+-   suckless and bouldering: different levels of documentation
+-   documentation as backdoor
+    --> but for a different target
 
-- cave paintings
+-   stealth
 
+-   cave paintings
 
 ## Plan for first draft deadline (20/02/2023)
 
-- intro good
-- first chapter 60% good 40% outline
-- second & third chapters outline and refs
-- update readme.md
-
+-   intro good
+-   first chapter 60% good 40% outline
+-   second & third chapters outline and refs
+-   update readme.md
 
 ## 9/02 Buddies session with Alex & Marloes
 
-- Intro:
-    - define that we are talking about code documentation
-    - define who is addressed when we say "developer"
-    - explicit structure of the chapters for last three paragraphs
-
+-   Intro:
+    -   define that we are talking about code documentation
+    -   define who is addressed when we say "developer"
+    -   explicit structure of the chapters for last three paragraphs
 
 ## Old notes