deleted test.txt
branch test
AND simple
& simple
conflict fixed
add merge
merge with no-ff
def
fix bug 101
merge bug fix 101
hehehehe
Merge branch 'dev'