diff --git a/zzz_draft_birdnet-pi/config.json b/zzz_draft_birdnet-pi/config.json
index e5a0556cd..f3288886b 100644
--- a/zzz_draft_birdnet-pi/config.json
+++ b/zzz_draft_birdnet-pi/config.json
@@ -94,11 +94,7 @@
   "slug": "birdnet-pi",
   "url": "https://github.com/alexbelgium/hassio-addons/tree/master/birdnet-pi",
   "usb": true,
-<<<<<<< Updated upstream
-  "version": "1.2",
-=======
   "version": "1.4",
->>>>>>> Stashed changes
   "video": true,
   "webui": "[PROTO:ssl]://[HOST]:[PORT:80]"
 }