branch test
AND simple
& simple
confict fixed
add merge
merge with no-ff
fix bug 001
merged bug fix 001
fix a bug
merge from dev