brabch test
AND simple
& simple
confilct fixed
add line
&
not
add merge
merge with no-ff
fix bug 101
merge bug fix 101