branch test
branch test2 dev2
AND simple
& simple
confilct fixed
--no-ff test
merge with no-ff
fix bug 101
merged bug fix 101