diff --git a/aglaia/thesis.md b/aglaia/thesis.md
index 7b95763..c73dc15 100644
--- a/aglaia/thesis.md
+++ b/aglaia/thesis.md
@@ -32,11 +32,8 @@ In the third and last chapter, I bridge the written text with the ongoing projec
 
 ---
 
-<<<<<<< HEAD
 ## borders
 
-=======
->>>>>>> 4d862d536e0c633a3cbd8cfd41517c7a6764385d
 > “on the other side is the river  
 > and I cannot cross it  
 > on the other side is the sea