branch test
and simple
&simple
confilct fixed
add merge
merge with no-ff
fix bug 101
merged bugfix 101