diff --git a/io-package.json b/io-package.json
index 8c143fc..846d046 100644
--- a/io-package.json
+++ b/io-package.json
@@ -350,4 +350,4 @@
       "native": {}
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/package.json b/package.json
index 5b90e35..c1e6596 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,10 @@
 {
   "name": "iobroker.knx",
+<<<<<<< HEAD
   "version": "2.0.28",
+=======
+  "version": "2.0.27",
+>>>>>>> 9a61641178db2a70100a80322dd9d1f09974667a
   "description": "ioBroker knx Adapter ",
   "author": {
     "name": "K.Ringmann",