new branch test
branch test 1
branch test 2
branch test 3
quick AND simple
quick & simple
conflict fixed
no-ff merge test
merge without fast-forward mode
rist
Merge branch 'dev'
fix bug 001
merge bug fix 001