diff --git a/sources/tag b/sources/tag
index 8cfbc90..ca97c40 100644
--- a/sources/tag
+++ b/sources/tag
@@ -1 +1,5 @@
-1.1.1
\ No newline at end of file
+<<<<<<< HEAD
+1.1.1
+=======
+1.2-dev
+>>>>>>> 2939038... [TAG] create 1.2-dev tag