brach test
and simple
& simple
conflict fixed
add merge
merge with no-ff
fix bug 101
dev finished
dev finished
master conflict fixed