diff --git a/text/nemo2024.txt b/text/nemo2024.txt
index 5a37dbc93..fcb1e865a 100644
--- a/text/nemo2024.txt
+++ b/text/nemo2024.txt
@@ -1,3 +1,6 @@
+<<<<<<< HEAD
+
+=======
 Projects for NEMO2024:
 
 1. images
@@ -9,3 +12,4 @@ Jadon
 Shubham Bhatnagar
 Anirudha Kumar
 Peter Teuben
+>>>>>>> upstream/master