main lo change chesa 1.txt y means merge conflict telusukundham ani

1.txt

@@ -6,6 +6,8 @@ void main()
 
 malli change chesa branch create chesina taruvata
 
+merge conflict yala untadho telusukundham
+
 while(1);
 
 }