AND simple
& simple
conflict fixed
add symbol
merge with no-ff
add hello.txt
change
fix bug 101
merged bug fix 101
add just test
fix bug and just test