diff --git a/korebuild-lock.txt b/korebuild-lock.txt
index 591cfd52ff..80b15e473a 100644
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@@ -1,2 +1,7 @@
+<<<<<<< HEAD
 version:3.0.0-alpha1-20181004.7
 commithash:27fabdaf2b1d4753c3d2749581694ca65d78f7f2
+=======
+version:2.2.0-preview2-20181004.6
+commithash:c04c4b2f5018632647f96210ab01876661302dac
+>>>>>>> release/2.2