diff --git a/README.md b/README.md
index b9578bb..a6155aa 100644
--- a/README.md
+++ b/README.md
@@ -147,7 +147,12 @@ Request body example:
 
 ##### GET /project/:projectid
 
+<<<<<<< HEAD
 Get a project by its id
+=======
+Get a project by project id
+
+> > > > > > > master
 
 ##### GET /followedprojects