From bf62c9a2f6f0e942b8eb8b20b449cf7eb8a9249d Mon Sep 17 00:00:00 2001
From: Enrique Barcelli <kiko@barcelli.net>
Date: Fri, 16 Aug 2024 18:11:33 +0800
Subject: [PATCH] Fix link

---
 README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/README.md b/README.md
index ac7d146..49a6571 100644
--- a/README.md
+++ b/README.md
@@ -47,11 +47,7 @@ Develop and sustain a healty community of 'makers' in Singapore by promoting the
 
 ### Project phases
 
-<<<<<<< HEAD
-- [Conceptualisation]("Conceptualisation ToR.md")
-=======
 - [Conceptualisation](ConceptualisationToR.md)
->>>>>>> 17339ef (Fix link)
 
 - Pilot Design and Development