branch test
AND simple
& simple
conflickt fixed
add merge
merge with no-ff
fix buf 101
merged bug fix 101