diff --git a/hacs.json b/hacs.json
index 63a8870..62108b8 100644
--- a/hacs.json
+++ b/hacs.json
@@ -1,13 +1,5 @@
 {
-<<<<<<< HEAD
     "name": "FPL",
     "country": "US",
-    "domains": [
-        "sensor"
-    ],
     "homeassistant": "2021.12.0"
-=======
-  "name": "Hass Fpl",
-  "country": ["US"]
->>>>>>> master
 }
\ No newline at end of file