update chesa side-ki 1.txt file merge conflict em ayina vastaya chudham

1.txt

@@ -3,6 +3,9 @@ void main()
  1st file to learn
 
 1st dhi change cheste em  avutadhi
+
+mundhu inko branchlo 1.txt change chesam epudu ekkada chesi conflict em ayina vastadhi emo chudham
+
 while(1);
 
-}
+}