brach test
AND simple
& simple
conflit fixed
add merge
mege with no-ff
fix bug 101
megerd bug fix 101