AND simple
& simple
modify readme.txt
branch commit
conflict fixed
fix bug 101
merge bug fix 101
fix bug 102
merged bug fix 102