branch test
AND simple
& simple
conflict fixed
change the readme.txt
fix bug 101
merged bug fix 101
...