diff --git a/tandoor_recipes/config.json b/tandoor_recipes/config.json
index 64d4a0191..a7796fec8 100644
--- a/tandoor_recipes/config.json
+++ b/tandoor_recipes/config.json
@@ -34,10 +34,6 @@
   "slug": "tandoor_recipes",
   "upstream": "1.0.4",
   "url": "https://github.com/alexbelgium/hassio-addons",
-<<<<<<< Updated upstream
   "version": "1.0.4-7",
-=======
-  "version": "1.0.4-6",
->>>>>>> Stashed changes
   "webui": "[PROTO:ssl]://[HOST]:[PORT:8080]"
 }