branch test
add a to branch dev
AND simple
& simple
confklict fixed
add merge
merge with no-ff
fix bug 101
merged bug fix 101