diff --git a/projects/take-away/take-away.md b/projects/take-away/take-away.md
index 6de935b..70d9a9a 100644
--- a/projects/take-away/take-away.md
+++ b/projects/take-away/take-away.md
@@ -73,32 +73,3 @@ Software is a river
 -   2 A3 means 1 A3 to provide context 1 A3 to provide a starting point for this
 -   context:
     -   situated doc -------> excerpts from the proj prop, framed in an accessible way (the outside of the spiral)
-<<<<<<< HEAD
-    -
-
-
-- this is the title:
-- _situated docs_
-- it's a 2 words compound
-- _docs_ stands for _documentation_
-- think about user manual, instructions, guidelines, tutorial
-- i want to explore the _documentation_ of coding related practices
-- aka _software documentation_
-- the instruction on how to use and make software
-- how to be a developer™
-- or how to do things with code without being a developer™
-- that is actually the case for most of the people that enjoy working with code
-
-
-- from a community-oriented perspective - size - context
-- that could be translated in 
-- the process of sharing knowledge and making worlds together
-- around situated software
-- ![tanuki](tanuki.jpg)
-- compile a list of resources to explore 
-
-
-- ![river](river.jpg)
-- how to navigate the river of softwaru
-=======
->>>>>>> 5c1aeeb8fbfbc9c9f60224f1a7d624f437fff4dc