branch test
modify master branch test
Merge branch 'dev'
AND simple
& simple
conflict fixed
add more
merge with no-ff
and dev2