branch test,create branch dev
AND simple
& simple
confict fixed
111111
2222222222
solve
add merge
merge with no-ff
fix bug in issue-101
merge bug fix 101
dev commit hello
Merge branch 'dev'