add merge
merge with no-ff
fix bug 101“

q

en
end
merge bug fix 101
creating a word file.

Signed-off-by: Romeo <yuhuanld@gmail.com>
Signed-off-by: Romeo <yuhuanld@gmail.com>
append a new line