branch test
feature
master branch
conflict
add merage
merge with no-ff
fix bug
merged bug fix
test
haha
test
fix a bug
merge bug
dev
merge dev