AND aimple
& simple
conflict fixed
branch manage strategy test
merge with no-ff
fix bug 101
merged bug fix 101