diff --git a/README.md b/README.md
index b3036b6..bb338d3 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1 @@
-SensorHub
-<<<<<<< HEAD
-=========
-=======
-===============
-
-New SensorHub
->>>>>>> 24b409026814f73f591e93c2a59a1e9dfd0d1f31
+SensorHub
\ No newline at end of file