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