Update README.md

README.md

 # icu-diary-3
 
-<<<<<<< HEAD
 # This is the official omega release version
-=======
->>>>>>> 2fde66550df046feae8b59dc440fbc89d7b4f8ad
+
 
 # Build Setup (frontend)
 ```