diff --git a/custom_components/fpl/manifest.json b/custom_components/fpl/manifest.json
index 653f1ea..ec5fb6d 100644
--- a/custom_components/fpl/manifest.json
+++ b/custom_components/fpl/manifest.json
@@ -11,12 +11,7 @@
   "requirements": [
     "integrationhelper"
   ],
-<<<<<<< HEAD
   "version": "1.0.0",
-  "issue_tracker": "https://github.com/dotKrad/hass-fpl/issues"
-=======
-  "homeassistant": "2021.12.7",
-  "version": "1.0.0",
-  "issue_tracker" : "https://github.com/dotKrad/hass-fpl/issues"
->>>>>>> master
+  "issue_tracker": "https://github.com/dotKrad/hass-fpl/issues",
+  "homeassistant": "2021.12.7"
 }
\ No newline at end of file