diff --git a/README.md b/README.md
index 70c6f7e..2d130ef 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1 @@
-<<<<<<< HEAD
-# grafana_datasource_plugin
-
 Datasource plugin for Grafana with E-CORE REST support