this is a readme txt.
 tks.
 add new line.
 end.
 
 add new line at 11:33 02-28.
 end.
 
 add new line at 14:32 02-28.
 end.

 add new line at dev branch at 15:11 02-28.
 end.

 add new line at master branch again at 15:35 02-28.
 add new line at dev branch again at 15:24 02-28.
 end.

 we can only fix the conflict by edit the file.
 end.