branch test
AND simple
& simple
conlict fixed
add merge with fast forward
merge woth on-off
fix bug 101
merge bug fix 101
add hello.py
merge hello.py