bransh test
AND simple
& simple
conflict fixed
fix bug 101
merged bug fix 101
add hello.txt
Merge branch 'dev'

merge dev