diff --git a/1.txt b/1.txt
index f0e1659..780f901 100644
--- a/1.txt
+++ b/1.txt
@@ -6,6 +6,8 @@ void main()
 
 malli change chesa branch create chesina taruvata
 
+merge conflict yala untadho telusukundham
+
 while(1);
 
-}
\ No newline at end of file
+}