branch test
AND simple
& simple
conflict fixed
add merge
add a new line in readme.txt
commit
conflict fixed