branch test
AND simple
&simple
conflict fixed
test new branch strategy
merge with no-ff
modify file in dev branch
Merge branch 'dev'
conflict caused by stash fixed
conflict fixed