1 files changed, 4 insertions, 0 deletions

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