branch test
add feature1
the master
fixed conflict
add new line
merge with no-ff
bug fix 111
issue001 fixed
merged bug fix 001
write dev
write dev 2
finish