add oone line text in branch dev
merge with --no-ff
one line
resolve the bug
merge bug fix issue-101