change readme.txt and add new line
adding 2 new lines
adding aaaaaaaaaaaa to readme.txt
adding bbbbbbbbbbbbbbb to readme.txt
finish merge
add readme.txt.orig
merge reme.txt
add readme.txt.orig