its me

index.html

@@ -90,14 +90,10 @@
 
 
                 <p>
-<<<<<<< Updated upstream
                     <a target="_blank" href="http://varia.zone/">Varia</a> member, creator of food magazine <a target="_blank" href="https://magiun.online/">Magiun</a>, core member of <a target="_blank" href="https://biobulkbende.org/"> BioBulkBende </a>, <a target="_blank" href="https://project.xpub.nl/is-it-time-to-eat-or-is-there-no-more-time-to-eat/">MA graduate</a> from the Piet Zwart Institute, in Experimental Publishing.
-=======
-                    <a target="_blank" href="http://varia.zone/">Varia</a> member, creator of food magazine <a target="_blank" href="https://magiun.alicestrete.me">Magiun</a>, teaching at <a target="_blank" href="https://www.wdka.nl/practices/autonomous-practices">WDKA</a>, cooking and coordinating at <a target="_blank" href="https://biobulkbende.org/"> BioBulkBende </a>, <a target="_blank" href="https://project.xpub.nl/is-it-time-to-eat-or-is-there-no-more-time-to-eat/">MA graduate</a> from the Piet Zwart Institute, in Experimental Publishing.
->>>>>>> Stashed changes
                 </p>
                 <p>
-                    Here's where you can find my <a target="_blank" href="https://portfolio.alicestrete.me/">work</a>. For more info, drop me an email at alice.strt [at] gmail [dot] com
+                    Here's where you can find my <a target="_blank" href="https://portfolio.alicestrete.me/">work</a>. For more info, drop me an email at strt [at] riseup [dot] net
                 </p>
 
             </div>