diff --git a/README.md b/README.md
index b7c417e..49f5a96 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,6 @@
-# WaterishOS-Revision3.0x
\ No newline at end of file
+<<<<<<< HEAD
+# WaterishOS-Revision3.0x
+=======
+# WaterishOS-Revision2.0x
+    This is Waterish OS Revision 2 for Board v2 based on esp8266
+>>>>>>> 4ea1442f6cc3a60cf380eb9710072af0624eefff