diff --git a/README.md b/README.md
index 7ce87fc..e58069c 100644
--- a/README.md
+++ b/README.md
@@ -35,11 +35,8 @@ solar_yield_entity: sensor.solar_yield
 type: 'custom:tesla-style-solar-power-card'
 ```
 
-<<<<<<< HEAD
-This is the full feature set when you have battery and an EVs (battery, car and car2 entities are all optional) 
-=======
 This is the full feature set when you have battery and an EVs (grid_to_battery, battery, car and car2 entities are all optional) 
->>>>>>> master
+
 The battery sensors (for cars too) need to be the percentage numbers (1-100). The left part of the equation can have any name.
 ```javascript
 grid_consumption_entity: sensor.grid_consumption