diff --git a/package.json b/package.json
index 9ad5eaa..7b5ea56 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "c4k-jitsi",
   "description": "Generate c4k yaml for a jitsi deployment.",
   "author": "meissa GmbH",
-  "version": "1.2.0",
+  "version": "1.2.2-SNAPSHOT",
   "homepage": "https://gitlab.com/domaindrivenarchitecture/c4k-jitsi#readme",
   "repository": "https://www.npmjs.com/package/c4k-jitsi",
   "license": "APACHE2",
diff --git a/project.clj b/project.clj
index 84e6e3f..af18b7a 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 (defproject org.domaindrivenarchitecture/c4k-jitsi "1.2.1-SNAPSHOT"
+=======
+(defproject org.domaindrivenarchitecture/c4k-jitsi "1.2.2-SNAPSHOT"
+>>>>>>> 3640427c743170831c0b9dcd6d6a6cec7f64eba1
   :description "jitsi c4k-installation package"
   :url "https://domaindrivenarchitecture.org"
   :license {:name "Apache License, Version 2.0"