branck test
an test
& simple
conflict fixed
add merge
merge with no-ff
check
check more
check more
fix bug 101
fix bug 102
merged bug fix 102
fix confilts