brach test
AND simple
& simple
conflict fixed
add branch
merge with no-ff
fix bug 101
merge bug 101
bug - dev - overCommit
dev commit
merge dev