branch test
and simple
& simple
conflict fixed
add merge
merge with no-ff
add hello.java
fix bug 101
merged bug fix issue-101
add syso
finsh one