diff --git a/package-lock.json b/package-lock.json
index 7dacd5e8..1d726c6a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "zigbee2mqtt",
-  "version": "1.29.1",
+  "version": "1.29.1-dev",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
@@ -33,13 +33,8 @@
         "winston-syslog": "^2.7.0",
         "winston-transport": "^4.5.0",
         "ws": "^8.11.0",
-<<<<<<< HEAD
         "zigbee-herdsman": "0.14.84",
         "zigbee-herdsman-converters": "15.0.17",
-=======
-        "zigbee-herdsman": "0.14.83",
-        "zigbee-herdsman-converters": "15.0.12-hotfix.0",
->>>>>>> master
         "zigbee2mqtt-frontend": "0.6.121"
       },
       "bin": {
diff --git a/package.json b/package.json
index 4b09f007..b33686ea 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zigbee2mqtt",
-  "version": "1.29.1",
+  "version": "1.29.1-dev",
   "description": "Zigbee to MQTT bridge using Zigbee-herdsman",
   "main": "index.js",
   "repository": {