create new dev
branch operating by myself
add message
modify
fix the conflict
with no-ff
merge with no-ff
fix bug
merge from fix bug
fix conflict