diff --git a/korebuild-lock.txt b/korebuild-lock.txt
index 641b9b208d..9a87e4ccb7 100644
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@@ -1,7 +1,2 @@
-<<<<<<< HEAD
 version:3.0.0-alpha1-20180919.1
 commithash:3066ae0a230870ea07e3f132605b5e5493f8bbd4
-=======
-version:2.2.0-preview1-20180918.1
-commithash:ad5e3fc53442741a0dd49bce437d2ac72f4b5800
->>>>>>> merge/release/2.2-to-master