diff --git a/README.md b/README.md
index 3d69bf34474cf14a658b231f76760f6ff58b8ab0..08fd871e0ba500d48fef5c2b1c9003b15ef9740a 100644
--- a/README.md
+++ b/README.md
@@ -14,12 +14,12 @@ All you need to run the latest version of the local fab lab workshop.
 Files to prepare  the workshop-kit files.
 ## Folder: fab-conference-proceedings
 Pictures and evaluations on past sessions at Fab conferences
-<<<<<<< HEAD
+
 ### 2018 fab14-toulouse-france: Pictures and evaluations on FAB14 session
 
 =======
-### 2018 fab14-tou;ouse-france: Pictures and evaluations on FAB14 session
->>>>>>> 1a4c5951f216c80b56d6c138413ec150c983128b
+### 2018 fab14-toulouse-france: Pictures and evaluations on FAB14 session
+
 ### 2019 fab15-elgouna-egypt: sources, kit and outcomes of a project blast and workshop titled "Fab Labs and SDGs; the Next Round" focusing on cooperating with Multilateral Development Banks (MDBs)
  
 # Authors