1 files changed, 5 insertions, 1 deletions

diff --git a/NEWS b/NEWS
index f4f1473..5f009e9 100644
--- a/NEWS
+++ b/NEWS
@@ -1 +1,5 @@
-The initial collaborated memosono (erikos).
\ No newline at end of file
+<<<<<<< HEAD:NEWS
+First version of the collaborated memosono. (erikos)
+=======
+The initial collaborated memosono (erikos).
+>>>>>>> tubes:NEWS