diff --git a/README.md b/README.md
index 74e066d..f00dfee 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 # Resources gathering tool
-=======
-# synf-sys
->>>>>>> 1095ca1 (added the device file)
 
 System information retrieval software for synf.
 
@@ -11,8 +7,4 @@ helps users throuble shoot performance issues and do general checkups on devices
 
 The system code is written in C and will be imported in the backend through cgo.
 
-<<<<<<< HEAD
-=======
 
-
->>>>>>> 1095ca1 (added the device file)