change first line
Revert "change first line"

This reverts commit ff94f8c1e229328f570a16e232b460462d382f92.
change first line
ll
first change
original
modify third line
lala
modify first line
Revert "modify first line"

This reverts commit a6cb27acc89482972a5a18aef171f113fdcc63ff.
original
modify first line
modify third line
Merge branch 'text'
solve conflict