branch test
AND simple
& simple
confilict fixed
add merge
merge with no-ff
merge fast
Merge branch 'dev'
bch1
add stash
dev branch
merged