branch test
AND simple
& simple
conflict fixed
deleted last line
change last line
conflict fixed
add merge
merge with no-ff
branch manage test
fix bug 110
merged by fix 110
merge dev
merge hehe