branch test
AND simple
& simple
conflict fixed
add branch dev
merge with no-ff
add s to 你好
Merge branch 'dev'