branch test
AND simple
& simple
confilct fixed
add merge
merge with no-ff
fixed the bug
mergerd bug fix 101
temporary is done
bug and work are all finished