branch test
AND simple
& simple
comflict fixed
add branch 'dev'
merge with no-ff
fix bug 101
merge bug fix 101
dev_test branch
merge dev_test