diff --git a/README.md b/README.md
index c361275..cd44450 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,6 @@ libSML is a library which implements the Smart Messaging Language (SML) protocol
 It can be utilized to communicate to FNN specified Smart Meters or Smart Meter components (EDL/MUC).
 
 ### Usage
-<<<<<<< HEAD
 Compile with
  
 	make