branch test
AND simple
& simple
confict fixed
add merge
merge with no-ff
add the file again:
fix bug 101
merged bug fix 101